From 0ded003703fb848bcffbc51e9f9aad287d347a08 Mon Sep 17 00:00:00 2001
From: Charles Milette <charles.milette@gmail.com>
Date: Mon, 15 Nov 2021 16:52:31 -0500
Subject: [PATCH] Fix wchar_t overloads and dump_info formatter

---
 include/spdlog/common.h         | 2 +-
 include/spdlog/fmt/bin_to_hex.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/spdlog/common.h b/include/spdlog/common.h
index 191ed224..b702c485 100644
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -154,7 +154,7 @@ template<typename... Args>
 using format_string_t = fmt::format_string<Args...>;
 
 template<typename... Args>
-using wformat_string_t = fmt::basic_format_string<wchar_t, Args...>;
+using wformat_string_t = fmt::basic_format_string<wchar_t, fmt::type_identity_t<Args>...>;
 
 template<class T>
 using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h
index 0dd16e7a..835e4f07 100644
--- a/include/spdlog/fmt/bin_to_hex.h
+++ b/include/spdlog/fmt/bin_to_hex.h
@@ -137,7 +137,7 @@ struct formatter<spdlog::details::dump_info<T>, char>
         SPDLOG_CONSTEXPR const char *hex_lower = "0123456789abcdef";
         const char *hex_chars = use_uppercase ? hex_upper : hex_lower;
 
-#if FMT_VERSION < 60000
+#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION < 60000
         auto inserter = ctx.begin();
 #else
         auto inserter = ctx.out();