mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-26 10:31:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed SPDLOG_FMT_STRING

Browse Source
This commit is contained in:
gabime 2023-09-17 02:35:55 +03:00
parent 25f64bcfb6
commit a3ef3ab7a4
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdlog/common.h
View File

@ -63,13 +63,11 @@
#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 #if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8
# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) # define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string)
# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string)
# if defined(SPDLOG_WCHAR_FILENAMES) # if defined(SPDLOG_WCHAR_FILENAMES)
# include <spdlog/fmt/xchar.h> # include <spdlog/fmt/xchar.h>
# endif # endif
#else #else
# define SPDLOG_FMT_RUNTIME(format_string) format_string # define SPDLOG_FMT_RUNTIME(format_string) format_string
# define SPDLOG_FMT_STRING(format_string) format_string
#endif #endif
#ifndef SPDLOG_FUNCTION #ifndef SPDLOG_FUNCTION

2
include/spdlog/details/fmt_helper.h
View File

@ -102,7 +102,7 @@ inline void pad2(int n, memory_buf_t &dest)
} }
else // unlikely, but just in case, let fmt deal with it else // unlikely, but just in case, let fmt deal with it
{ {
fmt_lib::format_to(std::back_inserter(dest), SPDLOG_FMT_STRING("{:02}"), n); fmt_lib::format_to(std::back_inserter(dest), "{:02}", n);
} }
} }

2
include/spdlog/fmt/bin_to_hex.h
View File

@ -241,7 +241,7 @@ struct formatter<spdlog::details::dump_info<T>, char>
if (put_positions) if (put_positions)
{ {
spdlog::fmt_lib::format_to(inserter, SPDLOG_FMT_STRING("{:04X}: "), pos); spdlog::fmt_lib::format_to(inserter, "{:04X}: ", pos);
} }
} }
}; };

4
include/spdlog/logger.h
View File

@ -25,9 +25,9 @@
# define SPDLOG_LOGGER_CATCH(location) \ # define SPDLOG_LOGGER_CATCH(location) \
catch (const std::exception &ex) \ catch (const std::exception &ex) \
{ \ { \
if (location.filename) \ if (!location.empty()) \
{ \ { \
err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ err_handler_(fmt_lib::format("{} [{}({})]", ex.what(), location.filename, location.line)); \
} \ } \
else \ else \
{ \ { \

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

@ -33,7 +33,7 @@ struct daily_filename_calculator
{ {
filename_t basename, ext; filename_t basename, ext;
std::tie(basename, ext) = details::file_helper::split_by_extension(filename); std::tie(basename, ext) = details::file_helper::split_by_extension(filename);
return fmt_lib::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}")), basename, now_tm.tm_year + 1900, return fmt_lib::format(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}"), basename, now_tm.tm_year + 1900,
now_tm.tm_mon + 1, now_tm.tm_mday, ext); now_tm.tm_mon + 1, now_tm.tm_mday, ext);
} }
}; };