diff options
| author | Zephyron <zephyron@citron-emu.orgq> | 2025-02-16 13:38:05 +1000 |
|---|---|---|
| committer | Zephyron <zephyron@citron-emu.orgq> | 2025-02-16 13:38:05 +1000 |
| commit | 7730d14b4a267c9579636a18af73d4252385e15f (patch) | |
| tree | e7deef63da5ae4605a1c5098d26253953b73d067 /src/common/logging | |
| parent | 677b8f476a94ec1b42d9ba1b0eeb17a3a5859133 (diff) | |
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
Diffstat (limited to 'src/common/logging')
| -rw-r--r-- | src/common/logging/backend.cpp | 2 | ||||
| -rw-r--r-- | src/common/logging/formatter.h | 4 | ||||
| -rw-r--r-- | src/common/logging/log.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 13aa4a5d2..fd26d1d47 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -6,7 +6,7 @@ #include <climits> #include <thread> -#include <fmt/format.h> +#include <fmt/ranges.h> #ifdef _WIN32 #include <windows.h> // For OutputDebugStringW diff --git a/src/common/logging/formatter.h b/src/common/logging/formatter.h index 88e55505d..07efba9c2 100644 --- a/src/common/logging/formatter.h +++ b/src/common/logging/formatter.h @@ -5,7 +5,7 @@ #include <type_traits> -#include <fmt/format.h> +#include <fmt/ranges.h> // adapted from https://github.com/fmtlib/fmt/issues/2704 // a generic formatter for enum classes @@ -14,7 +14,7 @@ template <typename T> struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>> : formatter<std::underlying_type_t<T>> { template <typename FormatContext> - auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) { + auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) { return fmt::formatter<std::underlying_type_t<T>>::format( static_cast<std::underlying_type_t<T>>(value), ctx); } diff --git a/src/common/logging/log.h b/src/common/logging/log.h index c00c01a9e..99e6f988a 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -6,7 +6,7 @@ #include <algorithm> #include <string_view> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/logging/formatter.h" #include "common/logging/types.h" |