diff options
| author | 2022-01-08 21:42:11 -0700 | |
|---|---|---|
| committer | 2022-01-09 17:35:33 -0700 | |
| commit | 09f4f3f23b5181883c7423a171edd5ec6467df02 (patch) | |
| tree | 62b940e8d5532affe487ed43bd97cd2992fe07f6 /src/common/logging | |
| parent | cmake: upgrade Conan package fmt to 8.1.1 ... (diff) | |
| download | yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.gz yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.xz yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.zip | |
logging/log.h: move enum class formatter to a separate file ...
... to common/logging/formatter.h
Diffstat (limited to 'src/common/logging')
| -rw-r--r-- | src/common/logging/formatter.h | 23 | ||||
| -rw-r--r-- | src/common/logging/log.h | 16 |
2 files changed, 24 insertions, 15 deletions
diff --git a/src/common/logging/formatter.h b/src/common/logging/formatter.h new file mode 100644 index 000000000..552cde75a --- /dev/null +++ b/src/common/logging/formatter.h | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | // Copyright 2022 yuzu Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include <type_traits> | ||
| 8 | |||
| 9 | #include <fmt/format.h> | ||
| 10 | |||
| 11 | // adapted from https://github.com/fmtlib/fmt/issues/2704 | ||
| 12 | // a generic formatter for enum classes | ||
| 13 | #if FMT_VERSION >= 80100 | ||
| 14 | template <typename T> | ||
| 15 | struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>> | ||
| 16 | : formatter<std::underlying_type_t<T>> { | ||
| 17 | template <typename FormatContext> | ||
| 18 | auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) { | ||
| 19 | return fmt::formatter<std::underlying_type_t<T>>::format( | ||
| 20 | static_cast<std::underlying_type_t<T>>(value), ctx); | ||
| 21 | } | ||
| 22 | }; | ||
| 23 | #endif | ||
diff --git a/src/common/logging/log.h b/src/common/logging/log.h index 096a441b8..0c80d01ee 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h | |||
| @@ -6,26 +6,12 @@ | |||
| 6 | 6 | ||
| 7 | #include <algorithm> | 7 | #include <algorithm> |
| 8 | #include <string_view> | 8 | #include <string_view> |
| 9 | #include <type_traits> | ||
| 10 | 9 | ||
| 11 | #include <fmt/format.h> | 10 | #include <fmt/format.h> |
| 12 | 11 | ||
| 12 | #include "common/logging/formatter.h" | ||
| 13 | #include "common/logging/types.h" | 13 | #include "common/logging/types.h" |
| 14 | 14 | ||
| 15 | // adapted from https://github.com/fmtlib/fmt/issues/2704 | ||
| 16 | // a generic formatter for enum classes (<= 32 bits) | ||
| 17 | #if FMT_VERSION >= 80100 | ||
| 18 | template <typename T> | ||
| 19 | struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>> | ||
| 20 | : formatter<std::underlying_type_t<T>> { | ||
| 21 | template <typename FormatContext> | ||
| 22 | auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) { | ||
| 23 | return fmt::formatter<std::underlying_type_t<T>>::format( | ||
| 24 | static_cast<std::underlying_type_t<T>>(value), ctx); | ||
| 25 | } | ||
| 26 | }; | ||
| 27 | #endif | ||
| 28 | |||
| 29 | namespace Common::Log { | 15 | namespace Common::Log { |
| 30 | 16 | ||
| 31 | // trims up to and including the last of ../, ..\, src/, src\ in a string | 17 | // trims up to and including the last of ../, ..\, src/, src\ in a string |