mirror of
https://github.com/gabime/spdlog.git
synced 2025-03-31 02:12:40 +08:00
Use 'SPDLOG_FMT_RUNTIME' to fix compilation error throwed MSVC and fmt 9.1.x (#2517)
* Use 'SPDLOG_FMT_RUNTIME' to fix compilation error throwed MSVC and fmt 9.1.x * Fix #2512
This commit is contained in:
parent
bced424855
commit
3c0e036cc9
@ -77,11 +77,14 @@ struct daily_filename_format_calculator
|
|||||||
#else
|
#else
|
||||||
// generate fmt datetime format string, e.g. {:%Y-%m-%d}.
|
// generate fmt datetime format string, e.g. {:%Y-%m-%d}.
|
||||||
filename_t fmt_filename = fmt::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{{:{}}}")), filename);
|
filename_t fmt_filename = fmt::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{{:{}}}")), filename);
|
||||||
# if defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) // for some reason msvc doesn't allow fmt::runtime(..) with wchar here
|
|
||||||
|
// MSVC doesn't allow fmt::runtime(..) with wchar, with fmtlib versions < 9.1.x
|
||||||
|
# if defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) && FMT_VERSION < 90101
|
||||||
return fmt::format(fmt_filename, now_tm);
|
return fmt::format(fmt_filename, now_tm);
|
||||||
# else
|
# else
|
||||||
return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm);
|
return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm);
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user