phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-22 23:30:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix Windows ERROR macro collision in logger

Browse source
This commit is contained in:
Kelsi 2026-02-25 11:14:53 -08:00
parent e1614d55a2
commit 35384b2c52
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/core/logger.hpp
View file

@ -26,6 +26,10 @@ enum class LogLevel {
FATAL FATAL
}; };
// Avoid direct token use of `ERROR` at call sites because Windows headers
// define `ERROR` as a macro.
inline constexpr LogLevel kLogLevelError = LogLevel::ERROR;
class Logger { class Logger {
public: public:
static Logger& getInstance(); static Logger& getInstance();
@ -128,7 +132,7 @@ private:
#define LOG_ERROR(...) do { \ #define LOG_ERROR(...) do { \
auto& _wowee_logger = wowee::core::Logger::getInstance(); \ auto& _wowee_logger = wowee::core::Logger::getInstance(); \
if (_wowee_logger.shouldLog(wowee::core::LogLevel::ERROR)) { \ if (_wowee_logger.shouldLog(wowee::core::kLogLevelError)) { \
_wowee_logger.error(__VA_ARGS__); \ _wowee_logger.error(__VA_ARGS__); \
} \ } \
} while (0) } while (0)

4
src/core/logger.cpp
View file

@ -49,7 +49,7 @@ void Logger::ensureFile() {
if (v == "debug") setLogLevel(LogLevel::DEBUG); if (v == "debug") setLogLevel(LogLevel::DEBUG);
else if (v == "info") setLogLevel(LogLevel::INFO); else if (v == "info") setLogLevel(LogLevel::INFO);
else if (v == "warn" || v == "warning") setLogLevel(LogLevel::WARNING); else if (v == "warn" || v == "warning") setLogLevel(LogLevel::WARNING);
else if (v == "error") setLogLevel(LogLevel::ERROR); else if (v == "error") setLogLevel(kLogLevelError);
else if (v == "fatal") setLogLevel(LogLevel::FATAL); else if (v == "fatal") setLogLevel(LogLevel::FATAL);
} }
std::error_code ec; std::error_code ec;
@ -83,7 +83,7 @@ void Logger::emitLineLocked(LogLevel level, const std::string& message) {
case LogLevel::DEBUG: line << "DEBUG"; break; case LogLevel::DEBUG: line << "DEBUG"; break;
case LogLevel::INFO: line << "INFO "; break; case LogLevel::INFO: line << "INFO "; break;
case LogLevel::WARNING: line << "WARN "; break; case LogLevel::WARNING: line << "WARN "; break;
case LogLevel::ERROR: line << "ERROR"; break; case kLogLevelError: line << "ERROR"; break;
case LogLevel::FATAL: line << "FATAL"; break; case LogLevel::FATAL: line << "FATAL"; break;
} }

2
src/main.cpp
View file

@ -38,7 +38,7 @@ static wowee::core::LogLevel readLogLevelFromEnv() {
if (level == "debug") return wowee::core::LogLevel::DEBUG; if (level == "debug") return wowee::core::LogLevel::DEBUG;
if (level == "info") return wowee::core::LogLevel::INFO; if (level == "info") return wowee::core::LogLevel::INFO;
if (level == "warn" || level == "warning") return wowee::core::LogLevel::WARNING; if (level == "warn" || level == "warning") return wowee::core::LogLevel::WARNING;
if (level == "error") return wowee::core::LogLevel::ERROR; if (level == "error") return wowee::core::kLogLevelError;
if (level == "fatal") return wowee::core::LogLevel::FATAL; if (level == "fatal") return wowee::core::LogLevel::FATAL;
return wowee::core::LogLevel::WARNING; return wowee::core::LogLevel::WARNING;
} }