diff options
Diffstat (limited to 'external')
-rw-r--r-- | external/easylogging++/ea_config.h | 4 | ||||
-rw-r--r-- | external/easylogging++/easylogging++.cc | 13 | ||||
-rw-r--r-- | external/easylogging++/easylogging++.h | 1 | ||||
m--------- | external/randomx | 0 |
4 files changed, 14 insertions, 4 deletions
diff --git a/external/easylogging++/ea_config.h b/external/easylogging++/ea_config.h index 4fb48ce3e..91a671575 100644 --- a/external/easylogging++/ea_config.h +++ b/external/easylogging++/ea_config.h @@ -1,5 +1,7 @@ #pragma once +#include <limits.h> + #define ELPP_THREAD_SAFE #define ELPP_DEFAULT_LOG_FILE "" #define ELPP_DISABLE_DEFAULT_CRASH_HANDLING @@ -9,7 +11,7 @@ #define ELPP_UTC_DATETIME #ifdef EASYLOGGING_CC -#if !(!defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__) +#if !(!defined __GLIBC__ || !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__) #define ELPP_FEATURE_CRASH_LOG #endif #endif diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index b89fd3daf..5c756bcdf 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -683,6 +683,13 @@ void LogBuilder::convertToColoredOutput(base::type::string_t* logLine, Level lev } } +void LogBuilder::setColor(Color color, bool bright) { +#if !ELPP_OS_WINDOWS + if (m_termSupportsColor) +#endif + el::base::utils::setConsoleColor(color, bright); +} + // Logger Logger::Logger(const std::string& id, base::LogStreamsReferenceMap* logStreamsReference) : @@ -2496,11 +2503,11 @@ void DefaultLogDispatchCallback::dispatch(base::type::string_t&& rawLinePrefix, if (m_data->logMessage()->logger()->m_typedConfigurations->toStandardOutput(m_data->logMessage()->level())) { const el::Level level = m_data->logMessage()->level(); const el::Color color = m_data->logMessage()->color(); - el::base::utils::setConsoleColor(el::base::utils::colorFromLevel(level), false); + m_data->logMessage()->logger()->logBuilder()->setColor(el::base::utils::colorFromLevel(level), false); ELPP_COUT << rawLinePrefix; - el::base::utils::setConsoleColor(color == el::Color::Default ? el::base::utils::colorFromLevel(level): color, color != el::Color::Default); + m_data->logMessage()->logger()->logBuilder()->setColor(color == el::Color::Default ? el::base::utils::colorFromLevel(level): color, color != el::Color::Default); ELPP_COUT << rawLinePayload; - el::base::utils::setConsoleColor(el::Color::Default, false); + m_data->logMessage()->logger()->logBuilder()->setColor(el::Color::Default, false); ELPP_COUT << std::flush; } } diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index a10b0c8e6..398afd20a 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -2235,6 +2235,7 @@ class LogBuilder : base::NoCopy { } virtual base::type::string_t build(const LogMessage* logMessage, bool appendNewLine) const = 0; void convertToColoredOutput(base::type::string_t* logLine, Level level, Color color); + void setColor(Color color, bool bright); private: bool m_termSupportsColor; friend class el::base::DefaultLogDispatchCallback; diff --git a/external/randomx b/external/randomx -Subproject 519b9cf70540bdd996e806251cde335c8eef8ac +Subproject 53af68c34a43f5bdb659f90cc27b6b2da7fd77f |