mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-03-15 02:29:54 +08:00
Code

Address code review comments: remove perfect forwarding on FormatString template parameters.

Browse Source
This commit is contained in:
Joe Burzinski 2020-06-03 21:47:48 -05:00
parent 3041faffab
commit 741b0d6e82
2 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
include/spdlog/logger.h
View File

@ -74,11 +74,10 @@ public:
void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; void swap(spdlog::logger &other) SPDLOG_NOEXCEPT;
// FormatString is a type derived from fmt::compile_string // FormatString is a type derived from fmt::compile_string
template<typename FormatString, typename std::enable_if<std::is_base_of<fmt::compile_string, FormatString>::value, int>::type = 0, template<typename FormatString, typename std::enable_if<fmt::is_compile_string<FormatString>::value, int>::type = 0, typename... Args>
typename... Args> void log(source_loc loc, level::level_enum lvl, const FormatString &fmt, const Args &... args)
void log(source_loc loc, level::level_enum lvl, FormatString &&fmt, const Args &... args)
{ {
log_(loc, lvl, std::forward<FormatString>(fmt), args...); log_(loc, lvl, fmt, args...);
} }
// FormatString is NOT a type derived from fmt::compile_string but is a string_view_t or can be implicitly converted to one // FormatString is NOT a type derived from fmt::compile_string but is a string_view_t or can be implicitly converted to one
@ -89,45 +88,45 @@ public:
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
void log(level::level_enum lvl, FormatString &&fmt, const Args &... args) void log(level::level_enum lvl, const FormatString &fmt, const Args &... args)
{ {
log(source_loc{}, lvl, std::forward<FormatString>(fmt), args...); log(source_loc{}, lvl, fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
void trace(FormatString &&fmt, const Args &... args) void trace(const FormatString &fmt, const Args &... args)
{ {
log(level::trace, std::forward<FormatString>(fmt), args...); log(level::trace, fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
void debug(FormatString &&fmt, const Args &... args) void debug(const FormatString &fmt, const Args &... args)
{ {
log(level::debug, std::forward<FormatString>(fmt), args...); log(level::debug, fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
void info(FormatString &&fmt, const Args &... args) void info(const FormatString &fmt, const Args &... args)
{ {
log(level::info, std::forward<FormatString>(fmt), args...); log(level::info, fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
void warn(FormatString &&fmt, const Args &... args) void warn(const FormatString &fmt, const Args &... args)
{ {
log(level::warn, std::forward<FormatString>(fmt), args...); log(level::warn, fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
void error(FormatString &&fmt, const Args &... args) void error(const FormatString &fmt, const Args &... args)
{ {
log(level::err, std::forward<FormatString>(fmt), args...); log(level::err, fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
void critical(FormatString &&fmt, const Args &... args) void critical(const FormatString &fmt, const Args &... args)
{ {
log(level::critical, std::forward<FormatString>(fmt), args...); log(level::critical, fmt, args...);
} }
template<typename T> template<typename T>
@ -136,8 +135,10 @@ public:
log(source_loc{}, lvl, msg); log(source_loc{}, lvl, msg);
} }
// T can be statically converted to string_view // T can be statically converted to string_view and isn't a fmt::compile_string
template<class T, typename std::enable_if<std::is_convertible<const T &, spdlog::string_view_t>::value, T>::type * = nullptr> template<class T,
typename std::enable_if<std::is_convertible<const T &, spdlog::string_view_t>::value && !fmt::is_compile_string<T>::value, T>::type
* = nullptr>
void log(source_loc loc, level::level_enum lvl, const T &msg) void log(source_loc loc, level::level_enum lvl, const T &msg)
{ {
log(loc, lvl, string_view_t{msg}); log(loc, lvl, string_view_t{msg});
@ -326,7 +327,7 @@ protected:
// common implementation for after templated public api has been resolved // common implementation for after templated public api has been resolved
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
void log_(source_loc loc, level::level_enum lvl, FormatString &&fmt, const Args &... args) void log_(source_loc loc, level::level_enum lvl, const FormatString &fmt, const Args &... args)
{ {
bool log_enabled = should_log(lvl); bool log_enabled = should_log(lvl);
bool traceback_enabled = tracer_.enabled(); bool traceback_enabled = tracer_.enabled();
@ -337,7 +338,7 @@ protected:
SPDLOG_TRY SPDLOG_TRY
{ {
memory_buf_t buf; memory_buf_t buf;
fmt::format_to(buf, std::forward<FormatString>(fmt), args...); fmt::format_to(buf, fmt, args...);
details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size()));
log_it_(log_msg, log_enabled, traceback_enabled); log_it_(log_msg, log_enabled, traceback_enabled);
} }

32
include/spdlog/spdlog.h
View File

@ -122,51 +122,51 @@ SPDLOG_API spdlog::logger *default_logger_raw();
SPDLOG_API void set_default_logger(std::shared_ptr<spdlog::logger> default_logger); SPDLOG_API void set_default_logger(std::shared_ptr<spdlog::logger> default_logger);
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
inline void log(source_loc source, level::level_enum lvl, FormatString &&fmt, const Args &... args) inline void log(source_loc source, level::level_enum lvl, const FormatString &fmt, const Args &... args)
{ {
default_logger_raw()->log(source, lvl, std::forward<FormatString>(fmt), args...); default_logger_raw()->log(source, lvl, fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
inline void log(level::level_enum lvl, FormatString &&fmt, const Args &... args) inline void log(level::level_enum lvl, const FormatString &fmt, const Args &... args)
{ {
default_logger_raw()->log(source_loc{}, lvl, std::forward<FormatString>(fmt), args...); default_logger_raw()->log(source_loc{}, lvl, fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
inline void trace(FormatString &&fmt, const Args &... args) inline void trace(const FormatString &fmt, const Args &... args)
{ {
default_logger_raw()->trace(std::forward<FormatString>(fmt), args...); default_logger_raw()->trace(fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
inline void debug(FormatString &&fmt, const Args &... args) inline void debug(const FormatString &fmt, const Args &... args)
{ {
default_logger_raw()->debug(std::forward<FormatString>(fmt), args...); default_logger_raw()->debug(fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
inline void info(FormatString &&fmt, const Args &... args) inline void info(const FormatString &fmt, const Args &... args)
{ {
default_logger_raw()->info(std::forward<FormatString>(fmt), args...); default_logger_raw()->info(fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
inline void warn(FormatString &&fmt, const Args &... args) inline void warn(const FormatString &fmt, const Args &... args)
{ {
default_logger_raw()->warn(std::forward<FormatString>(fmt), args...); default_logger_raw()->warn(fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
inline void error(FormatString &&fmt, const Args &... args) inline void error(const FormatString &fmt, const Args &... args)
{ {
default_logger_raw()->error(std::forward<FormatString>(fmt), args...); default_logger_raw()->error(fmt, args...);
} }
template<typename FormatString, typename... Args> template<typename FormatString, typename... Args>
inline void critical(FormatString &&fmt, const Args &... args) inline void critical(const FormatString &fmt, const Args &... args)
{ {
default_logger_raw()->critical(std::forward<FormatString>(fmt), args...); default_logger_raw()->critical(fmt, args...);
} }
template<typename T> template<typename T>