summaryrefslogtreecommitdiffstats
path: root/src/common/logging
diff options
context:
space:
mode:
authorliushuyu <liushuyu011@gmail.com>2022-01-09 05:42:11 +0100
committerliushuyu <liushuyu011@gmail.com>2022-01-10 01:35:33 +0100
commit09f4f3f23b5181883c7423a171edd5ec6467df02 (patch)
tree62b940e8d5532affe487ed43bd97cd2992fe07f6 /src/common/logging
parentcmake: upgrade Conan package fmt to 8.1.1 ... (diff)
downloadyuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar
yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.gz
yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.bz2
yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.lz
yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.xz
yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.zst
yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.zip
Diffstat (limited to 'src/common/logging')
-rw-r--r--src/common/logging/formatter.h23
-rw-r--r--src/common/logging/log.h16
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 @@
+// 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 096a441b8..0c80d01ee 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -6,26 +6,12 @@
#include <algorithm>
#include <string_view>
-#include <type_traits>
#include <fmt/format.h>
+#include "common/logging/formatter.h"
#include "common/logging/types.h"
-// adapted from https://github.com/fmtlib/fmt/issues/2704
-// a generic formatter for enum classes (<= 32 bits)
-#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
-
namespace Common::Log {
// trims up to and including the last of ../, ..\, src/, src\ in a string