Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-09-30 10:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.x' into std-format

Browse Source
This commit is contained in:
Charles Milette
2021-11-14 16:02:38 -05:00
committed by GitHub
parent d75de3d3b2 85bdfc8695
commit 8e359baaec
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdlog/sinks/daily_file_sink.h
View File

@@ -52,7 +52,7 @@ struct daily_filename_format_calculator
filename_t fmt_filename = fmt_lib::format(SPDLOG_FILENAME_T("{{:{}}}"), filename);
#if defined(SPDLOG_USE_STD_FORMAT)
return std::vformat(fmt_filename, std::make_format_args(now_tm));
#elif defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) // for some reason msvc doesnt allow fmt::runtime(..) with wchar here
#elif defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) // for some reason msvc doesn't allow fmt::runtime(..) with wchar here
return fmt::format(fmt_filename, now_tm);
#else
return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm);