diff options
Diffstat (limited to '')
-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 |
4 files changed, 27 insertions, 2 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 790193b00..adf70eb8b 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 000000000..552cde75a --- /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 c186d55ef..0c80d01ee 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 277be8541..d98b6029b 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 { |