diff options
Diffstat (limited to 'external/easylogging++')
-rw-r--r-- | external/easylogging++/ea_config.h | 2 | ||||
-rw-r--r-- | external/easylogging++/easylogging++.cc | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/external/easylogging++/ea_config.h b/external/easylogging++/ea_config.h index 4fb48ce3e..5bc603391 100644 --- a/external/easylogging++/ea_config.h +++ b/external/easylogging++/ea_config.h @@ -9,7 +9,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 7f9fd41cb..0f83e1de2 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -18,7 +18,6 @@ #include "easylogging++.h" #include <unistd.h> -#include <boost/algorithm/string.hpp> #if defined(AUTO_INITIALIZE_EASYLOGGINGPP) INITIALIZE_EASYLOGGINGPP @@ -2443,7 +2442,19 @@ void DefaultLogDispatchCallback::handle(const LogDispatchData* data) { if (strchr(msg.c_str(), '\n')) { std::vector<std::string> v; - boost::split(v, msg, boost::is_any_of("\n")); + const char *s = msg.c_str(); + while (true) + { + const char *ptr = strchr(s, '\n'); + if (!ptr) + { + if (*s) + v.push_back(s); + break; + } + v.push_back(std::string(s, ptr - s)); + s = ptr + 1; + } for (const std::string &s: v) { LogMessage msgline(logmsg->level(), logmsg->color(), logmsg->file(), logmsg->line(), logmsg->func(), logmsg->verboseLevel(), logmsg->logger(), &s); |