Merge c4fa9cb603 into 9ccb6af2bd

include/spdlog/details/logger_impl.h

@@ -59,10 +59,8 @@ inline void spdlog::logger::set_pattern(const std::string& pattern)
 
 
 template <typename... Args>
-inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Args&... args)
+inline void spdlog::logger::log_nofilter(level::level_enum lvl, const char* fmt, const Args&... args)
 {
-    if (!should_log(lvl)) return;
-
     try
     {
         details::log_msg log_msg(&_name, lvl);
@@ -80,9 +78,8 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Ar
 }
 
 template <typename... Args>
-inline void spdlog::logger::log(level::level_enum lvl, const char* msg)
+inline void spdlog::logger::log_nofilter(level::level_enum lvl, const char* msg)
 {
-    if (!should_log(lvl)) return;
     try
     {
         details::log_msg log_msg(&_name, lvl);
@@ -97,13 +94,11 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* msg)
     {
         _err_handler("Unknown exception");
     }
-
 }
 
 template<typename T>
-inline void spdlog::logger::log(level::level_enum lvl, const T& msg)
+inline void spdlog::logger::log_nofilter(level::level_enum lvl, const T& msg)
 {
-    if (!should_log(lvl)) return;
     try
     {
         details::log_msg log_msg(&_name, lvl);
@@ -120,6 +115,23 @@ inline void spdlog::logger::log(level::level_enum lvl, const T& msg)
     }
 }
 
+template <typename... Args>
+inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Args&... args)
+{
+    if (should_log(lvl)) log_nofilter(lvl, fmt, args...);
+}
+
+template <typename... Args>
+inline void spdlog::logger::log(level::level_enum lvl, const char* msg)
+{
+    if (should_log(lvl)) log_nofilter(lvl, msg);
+}
+
+template<typename T>
+inline void spdlog::logger::log(level::level_enum lvl, const T& msg)
+{
+    if (should_log(lvl)) log_nofilter(lvl, msg);
+}
 
 template <typename... Args>
 inline void spdlog::logger::trace(const char* fmt, const Args&... args)

include/spdlog/details/os.h

@@ -344,7 +344,7 @@ inline std::string errno_str(int err_num)
         return "Unkown error";
 
 #elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || \
-      ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) // posix version
+      ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) || !defined(__GLIBC__) // posix version
 
     if (strerror_r(err_num, buf, buf_size) == 0)
         return std::string(buf);

include/spdlog/logger.h

@@ -37,6 +37,8 @@ public:
 
     template <typename... Args> void log(level::level_enum lvl, const char* fmt, const Args&... args);
     template <typename... Args> void log(level::level_enum lvl, const char* msg);
+    template <typename... Args> void log_nofilter(level::level_enum lvl, const char* fmt, const Args&... args);
+    template <typename... Args> void log_nofilter(level::level_enum lvl, const char* msg);
     template <typename... Args> void trace(const char* fmt, const Args&... args);
     template <typename... Args> void debug(const char* fmt, const Args&... args);
     template <typename... Args> void info(const char* fmt, const Args&... args);
@@ -45,6 +47,7 @@ public:
     template <typename... Args> void critical(const char* fmt, const Args&... args);
 
     template <typename T> void log(level::level_enum lvl, const T&);
+    template <typename T> void log_nofilter(level::level_enum lvl, const T&);
     template <typename T> void trace(const T&);
     template <typename T> void debug(const T&);
     template <typename T> void info(const T&);