diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-01-09 18:29:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 18:29:59 -0800 |
| commit | b3308830b217cbdd9638b11e8660d079e16b3f01 (patch) | |
| tree | 59866b89fe1f5b29f40ace68e6e20badc7c38d30 | |
| parent | 18adea343ebd77dce1180942fc773ec891153ff8 (diff) | |
| parent | 09f4f3f23b5181883c7423a171edd5ec6467df02 (diff) | |
Merge pull request #7683 from liushuyu/fmt-8.1
logging: adapt to changes in fmt 8.1
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/common/logging/formatter.h | 23 | ||||
| -rw-r--r-- | src/common/logging/log.h | 3 | ||||
| -rw-r--r-- | src/shader_recompiler/exception.h | 2 |
5 files changed, 28 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 707d514c37..47bd282fb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,7 +169,7 @@ macro(yuzu_find_packages) set(REQUIRED_LIBS # Cmake Pkg Prefix Version Conan Pkg "Catch2 2.13.7 catch2/2.13.7" - "fmt 8.0.1 fmt/8.0.1" + "fmt 8.0.1 fmt/8.1.1" "lz4 1.8 lz4/1.9.2" "nlohmann_json 3.8 nlohmann_json/3.8.0" "ZLIB 1.2 zlib/1.2.11" diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 790193b003..adf70eb8ba 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -85,6 +85,7 @@ add_library(common STATIC logging/backend.h logging/filter.cpp logging/filter.h + logging/formatter.h logging/log.h logging/log_entry.h logging/text_formatter.cpp diff --git a/src/common/logging/formatter.h b/src/common/logging/formatter.h new file mode 100644 index 0000000000..552cde75a7 --- /dev/null +++ b/src/common/logging/formatter.h @@ -0,0 +1,23 @@ +// Copyright 2022 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include <type_traits> + +#include <fmt/format.h> + +// adapted from https://github.com/fmtlib/fmt/issues/2704 +// a generic formatter for enum classes +#if FMT_VERSION >= 80100 +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()) { + return fmt::formatter<std::underlying_type_t<T>>::format( + static_cast<std::underlying_type_t<T>>(value), ctx); + } +}; +#endif diff --git a/src/common/logging/log.h b/src/common/logging/log.h index c186d55ef6..0c80d01eee 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -7,8 +7,9 @@ #include <algorithm> #include <string_view> -#include <fmt/core.h> +#include <fmt/format.h> +#include "common/logging/formatter.h" #include "common/logging/types.h" namespace Common::Log { diff --git a/src/shader_recompiler/exception.h b/src/shader_recompiler/exception.h index 277be85412..d98b6029b1 100644 --- a/src/shader_recompiler/exception.h +++ b/src/shader_recompiler/exception.h @@ -9,7 +9,7 @@ #include <string_view> #include <utility> -#include <fmt/format.h> +#include "common/logging/formatter.h" namespace Shader { |