update fmt_runtime_string macro

pull/2694/head
H1X4 2 years ago
parent a77f3c995b
commit 651fc42cab

@ -173,10 +173,11 @@ using format_string_t = fmt::format_string<Args...>;
template<class T>
using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
template <typename Char>
#if FMT_VERSION >= 90101
# define FMT_STRING_RUNTIME fmt::runtime_format_string<Char>
using fmt_runtime_string = fmt::runtime_format_string<Char>;
#else
# define FMT_STRING_RUNTIME fmt::basic_runtime<Char>
using fmt_runtime_string = fmt::basic_runtime<Char>;
#endif
// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here,
@ -184,7 +185,7 @@ using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>
template<class T, class Char = char>
struct is_convertible_to_basic_format_string
: std::integral_constant<bool,
std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, FMT_STRING_RUNTIME>::value>
std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string>::value>
{};
# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)

Loading…
Cancel
Save