diff options
Diffstat (limited to 'src/LoggerSimple.h')
| -rw-r--r-- | src/LoggerSimple.h | 54 |
1 files changed, 22 insertions, 32 deletions
diff --git a/src/LoggerSimple.h b/src/LoggerSimple.h index 37ed36bc6..67802c320 100644 --- a/src/LoggerSimple.h +++ b/src/LoggerSimple.h @@ -13,64 +13,52 @@ enum class eLogLevel namespace Logger { -extern void LogFormat( - std::string_view a_Format, eLogLevel a_LogLevel, fmt::format_args a_ArgList -); -extern void LogPrintf( - std::string_view a_Format, eLogLevel a_LogLevel, fmt::printf_args a_ArgList -); +extern void LogFormat(std::string_view a_Format, eLogLevel a_LogLevel, fmt::format_args a_ArgList); +extern void LogPrintf(std::string_view a_Format, eLogLevel a_LogLevel, fmt::printf_args a_ArgList); extern void LogSimple(std::string_view a_Message, eLogLevel a_LogLevel); } // namespace Logger // python style format specified logging -template <typename... Args> -void FLOG(std::string_view a_Format, const Args & ... args) +template <typename... Args> void FLOG(std::string_view a_Format, const Args &... args) { Logger::LogFormat(a_Format, eLogLevel::Regular, fmt::make_format_args(args...)); } -template <typename... Args> -void FLOGINFO(std::string_view a_Format, const Args & ... args) +template <typename... Args> void FLOGINFO(std::string_view a_Format, const Args &... args) { Logger::LogFormat(a_Format, eLogLevel::Info, fmt::make_format_args(args...)); } -template <typename... Args> -void FLOGWARNING(std::string_view a_Format, const Args & ... args) +template <typename... Args> void FLOGWARNING(std::string_view a_Format, const Args &... args) { Logger::LogFormat(a_Format, eLogLevel::Warning, fmt::make_format_args(args...)); } -template <typename... Args> -void FLOGERROR(std::string_view a_Format, const Args & ... args) +template <typename... Args> void FLOGERROR(std::string_view a_Format, const Args &... args) { Logger::LogFormat(a_Format, eLogLevel::Error, fmt::make_format_args(args...)); } // printf style format specified logging (DEPRECATED) -template <typename... Args> -void LOG(std::string_view a_Format, const Args & ... args) +template <typename... Args> void LOG(std::string_view a_Format, const Args &... args) { Logger::LogPrintf(a_Format, eLogLevel::Regular, fmt::make_printf_args(args...)); } -template <typename... Args> -void LOGINFO(std::string_view a_Format, const Args & ... args) +template <typename... Args> void LOGINFO(std::string_view a_Format, const Args &... args) { Logger::LogPrintf(a_Format, eLogLevel::Info, fmt::make_printf_args(args...)); } -template <typename... Args> -void LOGWARNING(std::string_view a_Format, const Args & ... args) +template <typename... Args> void LOGWARNING(std::string_view a_Format, const Args &... args) { Logger::LogPrintf(a_Format, eLogLevel::Warning, fmt::make_printf_args(args...)); } -template <typename... Args> -void LOGERROR(std::string_view a_Format, const Args & ... args) +template <typename... Args> void LOGERROR(std::string_view a_Format, const Args &... args) { Logger::LogPrintf(a_Format, eLogLevel::Error, fmt::make_printf_args(args...)); } @@ -80,26 +68,28 @@ void LOGERROR(std::string_view a_Format, const Args & ... args) // In debug builds, translate LOGD to LOG, otherwise leave it out altogether: #if !defined(NDEBUG) || defined(TEST_GLOBALS) - #define LOGD LOG +#define LOGD LOG #else - #define LOGD(...) +#define LOGD(...) #endif // !NDEBUG #define LOGWARN LOGWARNING #if !defined(NDEBUG) || defined(TEST_GLOBALS) - #define FLOGD FLOG +#define FLOGD FLOG #else - #define FLOGD(...) +#define FLOGD(...) #endif // !NDEBUG #define FLOGWARN FLOGWARNING // Conditionally log a warning -#define CONDWARNING(ShouldLog, ...) \ - do { \ - if (ShouldLog) \ - { \ +#define CONDWARNING(ShouldLog, ...) \ + do \ + { \ + if (ShouldLog) \ + { \ LOGWARNING(__VA_ARGS__); \ - } \ - } while (false) + } \ + } \ + while (false) |