33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
From 276ee5f5c0eb13626bd367b006ace5eae9526d8a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Rui Chen <rui@chenrui.dev>
|
||
|
|
Date: Thu, 26 Dec 2024 02:13:57 -0500
|
||
|
|
Subject: [PATCH] fix: update to_string_view function for fmt 11.1 (#3301)
|
||
|
|
|
||
|
|
Signed-off-by: Rui Chen <rui@chenrui.dev>
|
||
|
|
---
|
||
|
|
include/spdlog/common.h | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/include/spdlog/common.h b/include/spdlog/common.h
|
||
|
|
index aca483c20..2d73f8300 100644
|
||
|
|
--- a/include/spdlog/common.h
|
||
|
|
+++ b/include/spdlog/common.h
|
||
|
|
@@ -365,10 +365,17 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifndef SPDLOG_USE_STD_FORMAT
|
||
|
|
+#if FMT_VERSION >= 110100
|
||
|
|
+template <typename T, typename... Args>
|
||
|
|
+inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_arg<T> fmt) {
|
||
|
|
+ return fmt;
|
||
|
|
+}
|
||
|
|
+#else
|
||
|
|
template <typename T, typename... Args>
|
||
|
|
inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
|
||
|
|
return fmt;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
#elif __cpp_lib_format >= 202207L
|
||
|
|
template <typename T, typename... Args>
|
||
|
|
SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
|