diff options
Diffstat (limited to 'base/logging.hpp')
| -rw-r--r-- | base/logging.hpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/base/logging.hpp b/base/logging.hpp index fc9fd1d9f0..45022db662 100644 --- a/base/logging.hpp +++ b/base/logging.hpp @@ -22,15 +22,15 @@ std::string ToString(LogLevel level); bool FromString(std::string const & s, LogLevel & level); std::vector<std::string> const & GetLogLevelNames(); -using TLogLevel = std::atomic<LogLevel>; -typedef void (*LogMessageFn)(LogLevel level, SrcPoint const &, std::string const &); +using AtomicLogLevel = std::atomic<LogLevel>; +using LogMessageFn = void (*)(LogLevel level, SrcPoint const &, std::string const &); LogLevel GetDefaultLogLevel(); LogLevel GetDefaultLogAbortLevel(); extern LogMessageFn LogMessage; -extern TLogLevel g_LogLevel; -extern TLogLevel g_LogAbortLevel; +extern AtomicLogLevel g_LogLevel; +extern AtomicLogLevel g_LogAbortLevel; /// @return Pointer to previous message function. LogMessageFn SetLogMessageFn(LogMessageFn fn); @@ -73,24 +73,14 @@ using ::my::LCRITICAL; #define LOG(level, msg) \ do \ { \ - if ((level) < ::my::g_LogLevel) \ - { \ - } \ - else \ - { \ + if (!((level) < ::my::g_LogLevel)) \ ::my::LogMessage(level, SRC(), ::my::impl::Message msg); \ - } \ } while (false) // Logging macro with short info (without entry point) #define LOG_SHORT(level, msg) \ do \ { \ - if ((level) < ::my::g_LogLevel) \ - { \ - } \ - else \ - { \ + if (!((level) < ::my::g_LogLevel)) \ ::my::LogMessage(level, my::SrcPoint(), ::my::impl::Message msg); \ - } \ } while (false) |