mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 00:30:06 +02:00
32 lines
1.1 KiB
Plaintext
32 lines
1.1 KiB
Plaintext
From 5a28aa089b689dd726e9baf05b5b4fd4c257a90e Mon Sep 17 00:00:00 2001
|
|
From: Shengqi Chen <harry@debian.org>
|
|
Date: Fri, 10 Jan 2025 13:47:17 +0100
|
|
Subject: applying Debian patch fix-fmtlib-11-1.patch
|
|
|
|
Bug: https://github.com/gabime/spdlog/pull/3301
|
|
Bug: https://github.com/gabime/spdlog/pull/3314
|
|
|
|
https://sources.debian.org/data/main/s/spdlog/1%3A1.15.0%2Bds-2/debian/patches/fix-fmtlib-11-1.patch
|
|
|
|
diff --git a/include/spdlog/common.h b/include/spdlog/common.h
|
|
index aca483c..71ffd24 100644
|
|
--- a/include/spdlog/common.h
|
|
+++ b/include/spdlog/common.h
|
|
@@ -364,12 +364,7 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view
|
|
}
|
|
#endif
|
|
|
|
-#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
|
|
+#if defined(SPDLOG_USE_STD_FORMAT) && __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 {
|
|
--
|
|
2.45.2
|
|
|