From 17f441e43c14b27070e8151d08ce6529a3daabae Mon Sep 17 00:00:00 2001
From: Charles Milette <charles.milette@gmail.com>
Date: Fri, 11 Nov 2022 00:01:41 -0500
Subject: [PATCH] Fix pre-VS 17.5 compilation

---
 include/spdlog/details/fmt_helper.h | 28 ++++++++++++++++++++++++++++
 include/spdlog/logger.h             | 14 ++++++++------
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h
index d3c355d5..9d55a3ce 100644
--- a/include/spdlog/details/fmt_helper.h
+++ b/include/spdlog/details/fmt_helper.h
@@ -11,6 +11,10 @@
 #ifdef SPDLOG_USE_STD_FORMAT
 #    include <charconv>
 #    include <limits>
+#    include <version>
+#    if __cpp_lib_format >= 202207L
+#        include <format>
+#    endif
 #endif
 
 // Some fmt helpers to efficiently format and pad ints and strings
@@ -23,6 +27,30 @@ inline spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEX
     return spdlog::string_view_t{buf.data(), buf.size()};
 }
 
+inline spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT
+{
+    return str;
+}
+
+inline spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT
+{
+    return str;
+}
+
+#ifndef SPDLOG_USE_STD_FORMAT
+template<typename T, typename Args...>
+inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt)
+{
+    return fmt;
+}
+#elif __cpp_lib_format >= 202207L
+template<typename T, typename Args...>
+SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT
+{
+    return fmt.get();
+}
+#endif
+
 inline void append_string_view(spdlog::string_view_t view, memory_buf_t &dest)
 {
     auto *buf_ptr = view.data();
diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h
index d5e88a37..094ee961 100644
--- a/include/spdlog/logger.h
+++ b/include/spdlog/logger.h
@@ -17,6 +17,7 @@
 #include <spdlog/common.h>
 #include <spdlog/details/log_msg.h>
 #include <spdlog/details/backtracer.h>
+#include <spdlog/details/fmt_helper.h>
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
 #    ifndef _WIN32
@@ -87,7 +88,7 @@ public:
     template<typename... Args>
     void log(source_loc loc, level::level_enum lvl, format_string_t<Args...> fmt, Args &&... args)
     {
-        log_(loc, lvl, fmt, std::forward<Args>(args)...);
+        log_(loc, lvl, details::fmt_helper::to_string_view(fmt), std::forward<Args>(args)...);
     }
 
     template<typename... Args>
@@ -180,7 +181,7 @@ public:
     template<typename... Args>
     void log(source_loc loc, level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&... args)
     {
-        log_(loc, lvl, fmt, std::forward<Args>(args)...);
+        log_(loc, lvl, details::fmt_helper::to_string_view(fmt), std::forward<Args>(args)...);
     }
 
     template<typename... Args>
@@ -357,7 +358,7 @@ protected:
 
     // common implementation for after templated public api has been resolved
     template<typename... Args>
-    void log_(source_loc loc, level::level_enum lvl, format_string_t<Args...> fmt, Args &&... args)
+    void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args)
     {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
@@ -368,7 +369,7 @@ protected:
         SPDLOG_TRY
         {
             memory_buf_t buf;
-            fmt_lib::format_to(std::back_inserter(buf), fmt, std::forward<Args>(args)...);
+            fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward<Args>(args)...));
 
             details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size()));
             log_it_(log_msg, log_enabled, traceback_enabled);
@@ -378,7 +379,7 @@ protected:
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
     template<typename... Args>
-    void log_(source_loc loc, level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&... args)
+    void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args)
     {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
@@ -390,7 +391,8 @@ protected:
         {
             // format to wmemory_buffer and convert to utf8
             wmemory_buf_t wbuf;
-            fmt_lib::format_to(std::back_inserter(wbuf), fmt, std::forward<Args>(args)...);
+            fmt_lib::vformat_to(
+                std::back_inserter(wbuf), fmt, fmt_lib::make_format_args<fmt_lib::wformat_context>(std::forward<Args>(args)...));
 
             memory_buf_t buf;
             details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf);