From 7730d14b4a267c9579636a18af73d4252385e15f Mon Sep 17 00:00:00 2001 From: Zephyron Date: Sun, 16 Feb 2025 13:38:05 +1000 Subject: [PATCH] build: upgrade fmt and SDL2 Update fmt library to version 11.0.2 and make necessary adjustments: - Replace fmt/format.h includes with fmt/ranges.h - Add const qualifiers to formatter::format functions - Update CMake to require fmt version 11 Additional dependency updates: - Update SDL2 bundled version from 2.28.2 to 2.32.0 - Update catch2 to version 3.8.0 - Update vcpkg baseline to c82f74667287d3dc386bce81e44964370c91a289 --- CMakeLists.txt | 4 ++-- src/citron/about_dialog.cpp | 2 +- src/citron/applets/qt_amiibo_settings.cpp | 2 +- src/citron/compatibility_list.cpp | 2 +- src/citron/configuration/configure_per_game.cpp | 2 +- src/citron/configuration/configure_ringcon.cpp | 2 +- src/citron/configuration/input_profiles.cpp | 2 +- src/citron/debugger/wait_tree.cpp | 2 +- src/citron/discord_impl.cpp | 2 +- src/citron/game_list.cpp | 2 +- src/citron/main.cpp | 2 +- src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp | 2 +- .../emu_window/emu_window_sdl2_null.cpp | 2 +- src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp | 2 +- src/common/common_precompiled_headers.h | 2 +- src/common/dynamic_library.cpp | 2 +- src/common/hex_util.h | 2 +- src/common/logging/backend.cpp | 2 +- src/common/logging/formatter.h | 4 ++-- src/common/logging/log.h | 2 +- src/common/nvidia_flags.cpp | 2 +- src/common/typed_address.h | 8 ++++---- src/common/uuid.cpp | 2 +- src/core/arm/dynarmic/dynarmic_cp15.cpp | 4 ++-- src/core/crypto/key_manager.h | 2 +- src/core/debugger/gdbstub.cpp | 1 + src/core/file_sys/bis_factory.cpp | 2 +- src/core/file_sys/fs_save_data_types.h | 2 +- src/core/file_sys/system_archive/ng_word.cpp | 2 +- src/core/hle/service/acc/profile_manager.cpp | 2 +- src/core/hle/service/ldn/ldn_types.h | 2 +- src/core/hle/service/nfc/common/device.cpp | 2 +- .../hle/service/nvdrv/devices/nvhost_ctrl.cpp | 2 +- src/core/hle/service/nvdrv/nvdrv.cpp | 2 +- src/core/hle/service/psc/time/common.h | 10 +++++----- src/core/hle/service/service.cpp | 2 +- src/core/hle/service/sockets/bsd.cpp | 2 +- src/core/perf_stats.cpp | 2 +- src/core/reporter.cpp | 2 +- src/hid_core/frontend/emulated_devices.cpp | 2 +- src/input_common/drivers/camera.cpp | 2 +- src/input_common/drivers/gc_adapter.cpp | 2 +- src/input_common/drivers/joycon.cpp | 2 +- src/input_common/drivers/mouse.cpp | 2 +- src/input_common/drivers/tas_input.cpp | 2 +- src/input_common/drivers/udp_client.cpp | 2 +- src/input_common/drivers/virtual_amiibo.cpp | 2 +- .../backend/glasm/glasm_emit_context.h | 2 +- .../backend/glasm/reg_alloc.cpp | 2 +- src/shader_recompiler/backend/glasm/reg_alloc.h | 16 ++++++++-------- .../backend/glsl/glsl_emit_context.h | 2 +- src/shader_recompiler/backend/glsl/var_alloc.cpp | 2 +- .../backend/spirv/spirv_emit_context.cpp | 2 +- src/shader_recompiler/frontend/ir/attribute.cpp | 2 +- src/shader_recompiler/frontend/ir/attribute.h | 4 ++-- src/shader_recompiler/frontend/ir/condition.cpp | 2 +- src/shader_recompiler/frontend/ir/condition.h | 4 ++-- src/shader_recompiler/frontend/ir/flow_test.cpp | 2 +- src/shader_recompiler/frontend/ir/flow_test.h | 4 ++-- src/shader_recompiler/frontend/ir/opcodes.h | 6 +++--- src/shader_recompiler/frontend/ir/pred.h | 4 ++-- src/shader_recompiler/frontend/ir/program.cpp | 2 +- src/shader_recompiler/frontend/ir/reg.h | 4 ++-- src/shader_recompiler/frontend/ir/type.h | 4 ++-- .../frontend/maxwell/control_flow.cpp | 2 +- .../frontend/maxwell/location.h | 4 ++-- src/shader_recompiler/frontend/maxwell/opcodes.h | 4 ++-- .../frontend/maxwell/structured_control_flow.cpp | 2 +- .../renderer_vulkan/pipeline_statistics.cpp | 2 +- .../renderer_vulkan/renderer_vulkan.cpp | 2 +- .../renderer_vulkan/vk_staging_buffer_pool.cpp | 2 +- src/video_core/texture_cache/formatter.h | 12 ++++++------ src/video_core/texture_cache/image_info.cpp | 2 +- .../vulkan_common/nsight_aftermath_tracker.cpp | 2 +- src/web_service/verify_user_jwt.h | 2 +- src/web_service/web_backend.cpp | 2 +- vcpkg.json | 6 +++--- 77 files changed, 111 insertions(+), 110 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7841c69b0..be2cb04f68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,7 +312,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # Enforce the search mode of non-required packages for better and shorter failure messages find_package(Boost REQUIRED context) find_package(enet MODULE) -find_package(fmt REQUIRED) +find_package(fmt 11 REQUIRED) if (CITRON_USE_LLVM_DEMANGLE) find_package(LLVM MODULE COMPONENTS Demangle) endif() @@ -390,7 +390,7 @@ if (ENABLE_SDL2) if (CITRON_USE_BUNDLED_SDL2) # Detect toolchain and platform if ((MSVC_VERSION GREATER_EQUAL 1920) AND ARCHITECTURE_x86_64) - set(SDL2_VER "SDL2-2.28.2") + set(SDL2_VER "SDL2-2.32.0") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRON_USE_BUNDLED_SDL2 and provide your own.") endif() diff --git a/src/citron/about_dialog.cpp b/src/citron/about_dialog.cpp index 0855776f2f..7aa3843230 100644 --- a/src/citron/about_dialog.cpp +++ b/src/citron/about_dialog.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include +#include #include "common/scm_rev.h" #include "ui_aboutdialog.h" #include "citron/about_dialog.h" diff --git a/src/citron/applets/qt_amiibo_settings.cpp b/src/citron/applets/qt_amiibo_settings.cpp index f21e602cdc..90f5dae990 100644 --- a/src/citron/applets/qt_amiibo_settings.cpp +++ b/src/citron/applets/qt_amiibo_settings.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include "common/assert.h" diff --git a/src/citron/compatibility_list.cpp b/src/citron/compatibility_list.cpp index f7cb308ab9..32192c7776 100644 --- a/src/citron/compatibility_list.cpp +++ b/src/citron/compatibility_list.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include "citron/compatibility_list.h" diff --git a/src/citron/configuration/configure_per_game.cpp b/src/citron/configuration/configure_per_game.cpp index 92a623c40c..6fa188df88 100644 --- a/src/citron/configuration/configure_per_game.cpp +++ b/src/citron/configuration/configure_per_game.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/src/citron/configuration/configure_ringcon.cpp b/src/citron/configuration/configure_ringcon.cpp index ae2e472193..c418468bd5 100644 --- a/src/citron/configuration/configure_ringcon.cpp +++ b/src/citron/configuration/configure_ringcon.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "configuration/qt_config.h" #include "hid_core/frontend/emulated_controller.h" diff --git a/src/citron/configuration/input_profiles.cpp b/src/citron/configuration/input_profiles.cpp index d9617e9f5a..23ea472f5b 100644 --- a/src/citron/configuration/input_profiles.cpp +++ b/src/citron/configuration/input_profiles.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/fs/fs.h" #include "common/fs/path_util.h" diff --git a/src/citron/debugger/wait_tree.cpp b/src/citron/debugger/wait_tree.cpp index fd26745f38..64d760eb4b 100644 --- a/src/citron/debugger/wait_tree.cpp +++ b/src/citron/debugger/wait_tree.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include +#include #include "citron/debugger/wait_tree.h" #include "citron/uisettings.h" diff --git a/src/citron/discord_impl.cpp b/src/citron/discord_impl.cpp index 35a4d03f01..acf803ffb1 100644 --- a/src/citron/discord_impl.cpp +++ b/src/citron/discord_impl.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include "citron/discord_impl.h" diff --git a/src/citron/game_list.cpp b/src/citron/game_list.cpp index 144ba058bc..ab61e513f7 100644 --- a/src/citron/game_list.cpp +++ b/src/citron/game_list.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include "common/common_types.h" #include "common/logging/log.h" #include "core/core.h" diff --git a/src/citron/main.cpp b/src/citron/main.cpp index 29fd143b24..c303953102 100644 --- a/src/citron/main.cpp +++ b/src/citron/main.cpp @@ -92,7 +92,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include // For SDL ScreenSaver functions #endif -#include +#include #include "common/detached_tasks.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp index 2ba82aee01..48b1647328 100644 --- a/src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp +++ b/src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp @@ -8,7 +8,7 @@ #define SDL_MAIN_HANDLED #include -#include +#include #include #include "common/logging/log.h" #include "common/scm_rev.h" diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp b/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp index b70369009f..7dae8396d6 100644 --- a/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp +++ b/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "common/logging/log.h" #include "common/scm_rev.h" diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp index a9ec816ab8..aedf16fb12 100644 --- a/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "common/logging/log.h" #include "common/scm_rev.h" diff --git a/src/common/common_precompiled_headers.h b/src/common/common_precompiled_headers.h index be7e5b5f94..b7e719dfd1 100644 --- a/src/common/common_precompiled_headers.h +++ b/src/common/common_precompiled_headers.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include "common/assert.h" #include "common/common_types.h" diff --git a/src/common/dynamic_library.cpp b/src/common/dynamic_library.cpp index 4fabe7e522..566fbed631 100644 --- a/src/common/dynamic_library.cpp +++ b/src/common/dynamic_library.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "common/dynamic_library.h" diff --git a/src/common/hex_util.h b/src/common/hex_util.h index 618f531522..2f5417143c 100644 --- a/src/common/hex_util.h +++ b/src/common/hex_util.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "common/assert.h" #include "common/common_types.h" diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 13aa4a5d2e..fd26d1d47c 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #ifdef _WIN32 #include // For OutputDebugStringW diff --git a/src/common/logging/formatter.h b/src/common/logging/formatter.h index 88e55505de..07efba9c27 100644 --- a/src/common/logging/formatter.h +++ b/src/common/logging/formatter.h @@ -5,7 +5,7 @@ #include -#include +#include // adapted from https://github.com/fmtlib/fmt/issues/2704 // a generic formatter for enum classes @@ -14,7 +14,7 @@ template struct fmt::formatter, char>> : formatter> { template - auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) { + auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) { return fmt::formatter>::format( static_cast>(value), ctx); } diff --git a/src/common/logging/log.h b/src/common/logging/log.h index c00c01a9e2..99e6f988a2 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "common/logging/formatter.h" #include "common/logging/types.h" diff --git a/src/common/nvidia_flags.cpp b/src/common/nvidia_flags.cpp index 97c989b641..1129604473 100644 --- a/src/common/nvidia_flags.cpp +++ b/src/common/nvidia_flags.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include "common/fs/fs.h" #include "common/fs/path_util.h" diff --git a/src/common/typed_address.h b/src/common/typed_address.h index d5e743583d..4df48a99fb 100644 --- a/src/common/typed_address.h +++ b/src/common/typed_address.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "common/common_types.h" @@ -262,7 +262,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Common::PhysicalAddress& addr, FormatContext& ctx) { + auto format(const Common::PhysicalAddress& addr, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{:#x}", static_cast(addr.GetValue())); } }; @@ -273,7 +273,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Common::ProcessAddress& addr, FormatContext& ctx) { + auto format(const Common::ProcessAddress& addr, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{:#x}", static_cast(addr.GetValue())); } }; @@ -284,7 +284,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Common::VirtualAddress& addr, FormatContext& ctx) { + auto format(const Common::VirtualAddress& addr, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{:#x}", static_cast(addr.GetValue())); } }; diff --git a/src/common/uuid.cpp b/src/common/uuid.cpp index 035df7fe01..8f0dba452c 100644 --- a/src/common/uuid.cpp +++ b/src/common/uuid.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "common/assert.h" #include "common/tiny_mt.h" diff --git a/src/core/arm/dynarmic/dynarmic_cp15.cpp b/src/core/arm/dynarmic/dynarmic_cp15.cpp index f3eee0d42a..c663adda19 100644 --- a/src/core/arm/dynarmic/dynarmic_cp15.cpp +++ b/src/core/arm/dynarmic/dynarmic_cp15.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2017 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/logging/log.h" #include "core/arm/dynarmic/arm_dynarmic_32.h" #include "core/arm/dynarmic/dynarmic_cp15.h" @@ -22,7 +22,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Dynarmic::A32::CoprocReg& reg, FormatContext& ctx) { + auto format(const Dynarmic::A32::CoprocReg& reg, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "cp{}", static_cast(reg)); } }; diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h index 2250eccec1..7de21f8a45 100644 --- a/src/core/crypto/key_manager.h +++ b/src/core/crypto/key_manager.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include "common/common_funcs.h" #include "common/common_types.h" #include "core/crypto/partition_data_manager.h" diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index 80091cc7e0..34b0b7d2b3 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -9,6 +9,7 @@ #include #include +#include #include "common/hex_util.h" #include "common/logging/log.h" diff --git a/src/core/file_sys/bis_factory.cpp b/src/core/file_sys/bis_factory.cpp index 350d0ce29d..3531719742 100644 --- a/src/core/file_sys/bis_factory.cpp +++ b/src/core/file_sys/bis_factory.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/fs/path_util.h" #include "core/file_sys/bis_factory.h" #include "core/file_sys/registered_cache.h" diff --git a/src/core/file_sys/fs_save_data_types.h b/src/core/file_sys/fs_save_data_types.h index 493dba34fb..fbb1b5421f 100644 --- a/src/core/file_sys/fs_save_data_types.h +++ b/src/core/file_sys/fs_save_data_types.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include #include "common/common_funcs.h" #include "common/common_types.h" diff --git a/src/core/file_sys/system_archive/ng_word.cpp b/src/core/file_sys/system_archive/ng_word.cpp index 1fa67877dd..a647e19eae 100644 --- a/src/core/file_sys/system_archive/ng_word.cpp +++ b/src/core/file_sys/system_archive/ng_word.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/common_types.h" #include "core/file_sys/system_archive/ng_word.h" #include "core/file_sys/vfs/vfs_vector.h" diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 292414f967..539f71c88f 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "common/fs/file.h" #include "common/fs/fs.h" diff --git a/src/core/hle/service/ldn/ldn_types.h b/src/core/hle/service/ldn/ldn_types.h index 6198aa07b2..fa0cdcbfa7 100644 --- a/src/core/hle/service/ldn/ldn_types.h +++ b/src/core/hle/service/ldn/ldn_types.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include "common/common_funcs.h" #include "common/common_types.h" diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index 1b898672e8..0af613e2ae 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -14,7 +14,7 @@ #pragma warning(pop) #endif -#include +#include #include "common/fs/file.h" #include "common/fs/fs.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 0265d55f27..7a035cd2c0 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include "common/assert.h" #include "common/logging/log.h" #include "common/scope_exit.h" diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 03eb507b98..8c618ca258 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include "core/core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/psc/time/common.h b/src/core/hle/service/psc/time/common.h index 3e13144a0d..d6e3e27eae 100644 --- a/src/core/hle/service/psc/time/common.h +++ b/src/core/hle/service/psc/time/common.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "common/common_types.h" #include "common/intrusive_list.h" @@ -167,7 +167,7 @@ constexpr inline Result GetSpanBetweenTimePoints(s64* out_seconds, const SteadyC template <> struct fmt::formatter : fmt::formatter { template - auto format(Service::PSC::Time::TimeType type, FormatContext& ctx) { + auto format(Service::PSC::Time::TimeType type, FormatContext& ctx) const { const string_view name = [type] { using Service::PSC::Time::TimeType; switch (type) { @@ -180,7 +180,7 @@ struct fmt::formatter : fmt::formatter::format(name, ctx); + return fmt::formatter::format(name, ctx); } }; @@ -228,7 +228,7 @@ template <> struct fmt::formatter : fmt::formatter { template auto format(const Service::PSC::Time::LocationName& name, FormatContext& ctx) const { - return formatter::format(name.data(), ctx); + return fmt::formatter::format(name.data(), ctx); } }; @@ -236,7 +236,7 @@ template <> struct fmt::formatter : fmt::formatter { template auto format(const Service::PSC::Time::RuleVersion& version, FormatContext& ctx) const { - return formatter::format(version.data(), ctx); + return fmt::formatter::format(version.data(), ctx); } }; diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index ce5e3b5b4c..deeea16aef 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/assert.h" #include "common/logging/log.h" #include "common/settings.h" diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index dd652ca421..ef03203349 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include "common/microprofile.h" #include "common/socket_types.h" diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index 957be9614d..770dffecb0 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 424bb63c70..a2627b5e2a 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include "common/fs/file.h" diff --git a/src/hid_core/frontend/emulated_devices.cpp b/src/hid_core/frontend/emulated_devices.cpp index a827aa9b73..f0b543c54c 100644 --- a/src/hid_core/frontend/emulated_devices.cpp +++ b/src/hid_core/frontend/emulated_devices.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include +#include #include "hid_core/frontend/emulated_devices.h" #include "hid_core/frontend/input_converter.h" diff --git a/src/input_common/drivers/camera.cpp b/src/input_common/drivers/camera.cpp index 04970f635d..11ca756406 100644 --- a/src/input_common/drivers/camera.cpp +++ b/src/input_common/drivers/camera.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/param_package.h" #include "input_common/drivers/camera.h" diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index f1184a5fa0..690779c6aa 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include #include "common/logging/log.h" diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index 72d2951f3d..43f3d6078e 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/param_package.h" #include "common/polyfill_ranges.h" diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index 9fb824bafe..4af2dd36f5 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include +#include #include #include "common/param_package.h" diff --git a/src/input_common/drivers/tas_input.cpp b/src/input_common/drivers/tas_input.cpp index f418714c12..ecd82af18c 100644 --- a/src/input_common/drivers/tas_input.cpp +++ b/src/input_common/drivers/tas_input.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include "common/fs/file.h" #include "common/fs/fs_types.h" diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp index 60821b31a6..553fee1aa5 100644 --- a/src/input_common/drivers/udp_client.cpp +++ b/src/input_common/drivers/udp_client.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include "common/logging/log.h" #include "common/param_package.h" diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cpp index 180eb53ef1..a30b10b7b3 100644 --- a/src/input_common/drivers/virtual_amiibo.cpp +++ b/src/input_common/drivers/virtual_amiibo.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include -#include +#include #include "common/fs/file.h" #include "common/fs/fs.h" diff --git a/src/shader_recompiler/backend/glasm/glasm_emit_context.h b/src/shader_recompiler/backend/glasm/glasm_emit_context.h index a81d64a9e4..4b8951ddb4 100644 --- a/src/shader_recompiler/backend/glasm/glasm_emit_context.h +++ b/src/shader_recompiler/backend/glasm/glasm_emit_context.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include "shader_recompiler/backend/glasm/reg_alloc.h" #include "shader_recompiler/stage.h" diff --git a/src/shader_recompiler/backend/glasm/reg_alloc.cpp b/src/shader_recompiler/backend/glasm/reg_alloc.cpp index 781803e550..3919d63268 100644 --- a/src/shader_recompiler/backend/glasm/reg_alloc.cpp +++ b/src/shader_recompiler/backend/glasm/reg_alloc.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "shader_recompiler/backend/glasm/reg_alloc.h" #include "shader_recompiler/exception.h" diff --git a/src/shader_recompiler/backend/glasm/reg_alloc.h b/src/shader_recompiler/backend/glasm/reg_alloc.h index bd6e2d929c..9cd0091326 100644 --- a/src/shader_recompiler/backend/glasm/reg_alloc.h +++ b/src/shader_recompiler/backend/glasm/reg_alloc.h @@ -5,7 +5,7 @@ #include -#include +#include #include "common/bit_cast.h" #include "common/bit_field.h" @@ -184,7 +184,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(Shader::Backend::GLASM::Id id, FormatContext& ctx) { + auto format(Shader::Backend::GLASM::Id id, FormatContext& ctx) const { return Shader::Backend::GLASM::FormatTo(ctx, id); } }; @@ -195,7 +195,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::Backend::GLASM::Register& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::Register& value, FormatContext& ctx) const { if (value.type != Shader::Backend::GLASM::Type::Register) { throw Shader::InvalidArgument("Register value type is not register"); } @@ -209,7 +209,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::Backend::GLASM::ScalarRegister& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarRegister& value, FormatContext& ctx) const { if (value.type != Shader::Backend::GLASM::Type::Register) { throw Shader::InvalidArgument("Register value type is not register"); } @@ -223,7 +223,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::Backend::GLASM::ScalarU32& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarU32& value, FormatContext& ctx) const { switch (value.type) { case Shader::Backend::GLASM::Type::Void: break; @@ -244,7 +244,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::Backend::GLASM::ScalarS32& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarS32& value, FormatContext& ctx) const { switch (value.type) { case Shader::Backend::GLASM::Type::Void: break; @@ -265,7 +265,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::Backend::GLASM::ScalarF32& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarF32& value, FormatContext& ctx) const { switch (value.type) { case Shader::Backend::GLASM::Type::Void: break; @@ -286,7 +286,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::Backend::GLASM::ScalarF64& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarF64& value, FormatContext& ctx) const { switch (value.type) { case Shader::Backend::GLASM::Type::Void: break; diff --git a/src/shader_recompiler/backend/glsl/glsl_emit_context.h b/src/shader_recompiler/backend/glsl/glsl_emit_context.h index 7587f7bab3..331c0588e3 100644 --- a/src/shader_recompiler/backend/glsl/glsl_emit_context.h +++ b/src/shader_recompiler/backend/glsl/glsl_emit_context.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include "shader_recompiler/backend/glsl/var_alloc.h" #include "shader_recompiler/stage.h" diff --git a/src/shader_recompiler/backend/glsl/var_alloc.cpp b/src/shader_recompiler/backend/glsl/var_alloc.cpp index 8b7da539ae..ff6e2d5d5b 100644 --- a/src/shader_recompiler/backend/glsl/var_alloc.cpp +++ b/src/shader_recompiler/backend/glsl/var_alloc.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "shader_recompiler/backend/glsl/var_alloc.h" #include "shader_recompiler/exception.h" diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp index a27f2f73ac..388ddce2c8 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include "common/common_types.h" #include "common/div_ceil.h" diff --git a/src/shader_recompiler/frontend/ir/attribute.cpp b/src/shader_recompiler/frontend/ir/attribute.cpp index 1bf9db9353..97f253602d 100644 --- a/src/shader_recompiler/frontend/ir/attribute.cpp +++ b/src/shader_recompiler/frontend/ir/attribute.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "shader_recompiler/exception.h" #include "shader_recompiler/frontend/ir/attribute.h" diff --git a/src/shader_recompiler/frontend/ir/attribute.h b/src/shader_recompiler/frontend/ir/attribute.h index 5f039b6f65..7a06713803 100644 --- a/src/shader_recompiler/frontend/ir/attribute.h +++ b/src/shader_recompiler/frontend/ir/attribute.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include "common/common_types.h" @@ -250,7 +250,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::IR::Attribute& attribute, FormatContext& ctx) { + auto format(const Shader::IR::Attribute& attribute, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(attribute)); } }; diff --git a/src/shader_recompiler/frontend/ir/condition.cpp b/src/shader_recompiler/frontend/ir/condition.cpp index fb6b141d34..4db0c164f0 100644 --- a/src/shader_recompiler/frontend/ir/condition.cpp +++ b/src/shader_recompiler/frontend/ir/condition.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include "shader_recompiler/frontend/ir/condition.h" diff --git a/src/shader_recompiler/frontend/ir/condition.h b/src/shader_recompiler/frontend/ir/condition.h index 1cad46b9b9..89ac42dbe0 100644 --- a/src/shader_recompiler/frontend/ir/condition.h +++ b/src/shader_recompiler/frontend/ir/condition.h @@ -5,7 +5,7 @@ #include -#include +#include #include "common/common_types.h" #include "shader_recompiler/frontend/ir/flow_test.h" @@ -52,7 +52,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::IR::Condition& cond, FormatContext& ctx) { + auto format(const Shader::IR::Condition& cond, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(cond)); } }; diff --git a/src/shader_recompiler/frontend/ir/flow_test.cpp b/src/shader_recompiler/frontend/ir/flow_test.cpp index a859efddeb..c2dbe2690f 100644 --- a/src/shader_recompiler/frontend/ir/flow_test.cpp +++ b/src/shader_recompiler/frontend/ir/flow_test.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include "shader_recompiler/frontend/ir/flow_test.h" diff --git a/src/shader_recompiler/frontend/ir/flow_test.h b/src/shader_recompiler/frontend/ir/flow_test.h index 88f7c9e82e..014ae6b659 100644 --- a/src/shader_recompiler/frontend/ir/flow_test.h +++ b/src/shader_recompiler/frontend/ir/flow_test.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include #include "common/common_types.h" @@ -55,7 +55,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::IR::FlowTest& flow_test, FormatContext& ctx) { + auto format(const Shader::IR::FlowTest& flow_test, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(flow_test)); } }; diff --git a/src/shader_recompiler/frontend/ir/opcodes.h b/src/shader_recompiler/frontend/ir/opcodes.h index e300714f3a..6caf12af4e 100644 --- a/src/shader_recompiler/frontend/ir/opcodes.h +++ b/src/shader_recompiler/frontend/ir/opcodes.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "common/polyfill_ranges.h" #include "shader_recompiler/frontend/ir/type.h" @@ -54,7 +54,7 @@ constexpr Type F64x2{Type::F64x2}; constexpr Type F64x3{Type::F64x3}; constexpr Type F64x4{Type::F64x4}; -constexpr OpcodeMeta META_TABLE[]{ +constexpr OpcodeMeta META_TABLE[] { #define OPCODE(name_token, type_token, ...) \ { \ .name{#name_token}, \ @@ -103,7 +103,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::IR::Opcode& op, FormatContext& ctx) { + auto format(const Shader::IR::Opcode& op, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(op)); } }; diff --git a/src/shader_recompiler/frontend/ir/pred.h b/src/shader_recompiler/frontend/ir/pred.h index a77c1e2a7a..4c9e8b6bdf 100644 --- a/src/shader_recompiler/frontend/ir/pred.h +++ b/src/shader_recompiler/frontend/ir/pred.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace Shader::IR { @@ -33,7 +33,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::IR::Pred& pred, FormatContext& ctx) { + auto format(const Shader::IR::Pred& pred, FormatContext& ctx) const { if (pred == Shader::IR::Pred::PT) { return fmt::format_to(ctx.out(), "PT"); } else { diff --git a/src/shader_recompiler/frontend/ir/program.cpp b/src/shader_recompiler/frontend/ir/program.cpp index bda56ff461..39ff92ce75 100644 --- a/src/shader_recompiler/frontend/ir/program.cpp +++ b/src/shader_recompiler/frontend/ir/program.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "shader_recompiler/frontend/ir/basic_block.h" #include "shader_recompiler/frontend/ir/program.h" diff --git a/src/shader_recompiler/frontend/ir/reg.h b/src/shader_recompiler/frontend/ir/reg.h index f7cb716a97..97c97420b8 100644 --- a/src/shader_recompiler/frontend/ir/reg.h +++ b/src/shader_recompiler/frontend/ir/reg.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include "common/common_types.h" #include "shader_recompiler/exception.h" @@ -319,7 +319,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::IR::Reg& reg, FormatContext& ctx) { + auto format(const Shader::IR::Reg& reg, FormatContext& ctx) const { if (reg == Shader::IR::Reg::RZ) { return fmt::format_to(ctx.out(), "RZ"); } else if (static_cast(reg) >= 0 && static_cast(reg) < 255) { diff --git a/src/shader_recompiler/frontend/ir/type.h b/src/shader_recompiler/frontend/ir/type.h index 04c8c4ddbe..91fabdcf3e 100644 --- a/src/shader_recompiler/frontend/ir/type.h +++ b/src/shader_recompiler/frontend/ir/type.h @@ -5,7 +5,7 @@ #include -#include +#include #include "common/common_funcs.h" #include "shader_recompiler/exception.h" @@ -54,7 +54,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::IR::Type& type, FormatContext& ctx) { + auto format(const Shader::IR::Type& type, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", NameOf(type)); } }; diff --git a/src/shader_recompiler/frontend/maxwell/control_flow.cpp b/src/shader_recompiler/frontend/maxwell/control_flow.cpp index dce414cb47..a2ad56cc49 100644 --- a/src/shader_recompiler/frontend/maxwell/control_flow.cpp +++ b/src/shader_recompiler/frontend/maxwell/control_flow.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "common/polyfill_ranges.h" #include "shader_recompiler/exception.h" diff --git a/src/shader_recompiler/frontend/maxwell/location.h b/src/shader_recompiler/frontend/maxwell/location.h index 0c0477e2db..3093c7a8ee 100644 --- a/src/shader_recompiler/frontend/maxwell/location.h +++ b/src/shader_recompiler/frontend/maxwell/location.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include "common/common_types.h" #include "shader_recompiler/exception.h" @@ -102,7 +102,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::Maxwell::Location& location, FormatContext& ctx) { + auto format(const Shader::Maxwell::Location& location, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{:04x}", location.Offset()); } }; diff --git a/src/shader_recompiler/frontend/maxwell/opcodes.h b/src/shader_recompiler/frontend/maxwell/opcodes.h index 72dd143c2a..18ed4f6e1a 100644 --- a/src/shader_recompiler/frontend/maxwell/opcodes.h +++ b/src/shader_recompiler/frontend/maxwell/opcodes.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace Shader::Maxwell { @@ -23,7 +23,7 @@ struct fmt::formatter { return ctx.begin(); } template - auto format(const Shader::Maxwell::Opcode& opcode, FormatContext& ctx) { + auto format(const Shader::Maxwell::Opcode& opcode, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", NameOf(opcode)); } }; diff --git a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp index 80c90fe6ac..3c18f49982 100644 --- a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp +++ b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/src/video_core/renderer_vulkan/pipeline_statistics.cpp b/src/video_core/renderer_vulkan/pipeline_statistics.cpp index fcd160a326..545971bd88 100644 --- a/src/video_core/renderer_vulkan/pipeline_statistics.cpp +++ b/src/video_core/renderer_vulkan/pipeline_statistics.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include "common/common_types.h" #include "common/logging/log.h" diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index c553f5b3d9..96fb8fba60 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include "common/logging/log.h" #include "common/polyfill_ranges.h" diff --git a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp index 03a0b7280b..72d5ec35f9 100644 --- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "common/alignment.h" #include "common/assert.h" diff --git a/src/video_core/texture_cache/formatter.h b/src/video_core/texture_cache/formatter.h index cabbfcb2dd..fab4bc979c 100644 --- a/src/video_core/texture_cache/formatter.h +++ b/src/video_core/texture_cache/formatter.h @@ -5,7 +5,7 @@ #include -#include +#include #include "video_core/surface.h" #include "video_core/texture_cache/types.h" @@ -13,7 +13,7 @@ template <> struct fmt::formatter : fmt::formatter { template - auto format(VideoCore::Surface::PixelFormat format, FormatContext& ctx) { + auto format(VideoCore::Surface::PixelFormat format, FormatContext& ctx) const { using VideoCore::Surface::PixelFormat; const string_view name = [format] { switch (format) { @@ -227,14 +227,14 @@ struct fmt::formatter : fmt::formatter::format(name, ctx); + return fmt::formatter::format(name, ctx); } }; template <> struct fmt::formatter : fmt::formatter { template - auto format(VideoCommon::ImageType type, FormatContext& ctx) { + auto format(VideoCommon::ImageType type, FormatContext& ctx) const { const string_view name = [type] { using VideoCommon::ImageType; switch (type) { @@ -251,7 +251,7 @@ struct fmt::formatter : fmt::formatter } return "Invalid"; }(); - return formatter::format(name, ctx); + return fmt::formatter::format(name, ctx); } }; @@ -262,7 +262,7 @@ struct fmt::formatter { } template - auto format(const VideoCommon::Extent3D& extent, FormatContext& ctx) { + auto format(const VideoCommon::Extent3D& extent, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{{{}, {}, {}}}", extent.width, extent.height, extent.depth); } diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp index 9444becceb..135dd64de3 100644 --- a/src/video_core/texture_cache/image_info.cpp +++ b/src/video_core/texture_cache/image_info.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/assert.h" #include "common/settings.h" diff --git a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp index 60f62fb6f7..aacc561b53 100644 --- a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp +++ b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include "common/common_types.h" #include "common/fs/file.h" diff --git a/src/web_service/verify_user_jwt.h b/src/web_service/verify_user_jwt.h index 27b0a100c6..5be7c87ebb 100644 --- a/src/web_service/verify_user_jwt.h +++ b/src/web_service/verify_user_jwt.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include "network/verify_user.h" #include "web_service/web_backend.h" diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp index fdf3ac8463..c04cdd9707 100644 --- a/src/web_service/web_backend.cpp +++ b/src/web_service/web_backend.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #ifdef __GNUC__ #pragma GCC diagnostic push diff --git a/vcpkg.json b/vcpkg.json index 180232afd6..3c57e651d1 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "citron", - "builtin-baseline": "7adc2e4d49e8d0efc07a369079faa6bc3dbb90f3", + "builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289", "version": "1.0", "dependencies": [ "boost-algorithm", @@ -55,11 +55,11 @@ "overrides": [ { "name": "catch2", - "version": "3.3.1" + "version": "3.8.0" }, { "name": "fmt", - "version": "10.1.1" + "version": "11.0.2" } ] }