Skip to content

S
spdlog
Commit a5f5ff70 authored by gabime's avatar gabime
Browse files
Options

Fixed clang c++20 compile

parent 4f0e3202
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
include/spdlog/logger.h
View file @ a5f5ff70
...@@ -19,25 +19,25 @@ ...@@ -19,25 +19,25 @@
#include <spdlog/details/backtracer.h> #include <spdlog/details/backtracer.h>
#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
#include <spdlog/details/os.h> # include <spdlog/details/os.h>
#endif #endif
#include <vector> #include <vector>
#include <iterator> #include <iterator>
#ifndef SPDLOG_NO_EXCEPTIONS #ifndef SPDLOG_NO_EXCEPTIONS
#define SPDLOG_LOGGER_CATCH() \ # define SPDLOG_LOGGER_CATCH() \
catch (const std::exception &ex) \ catch (const std::exception &ex) \
{ \ { \
err_handler_(ex.what()); \ err_handler_(ex.what()); \
} \ } \
catch (...) \ catch (...) \
{ \ { \
err_handler_("Rethrowing unknown exception in logger"); \ err_handler_("Rethrowing unknown exception in logger"); \
throw; \ throw; \
} }
#else #else
#define SPDLOG_LOGGER_CATCH() # define SPDLOG_LOGGER_CATCH()
#endif #endif
namespace spdlog { namespace spdlog {
...@@ -223,9 +223,9 @@ public: ...@@ -223,9 +223,9 @@ public:
} }
#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
#ifndef _WIN32 # ifndef _WIN32
#error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows # error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
#else # else
template<typename... Args> template<typename... Args>
void log(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&...args) void log(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&...args)
...@@ -240,7 +240,7 @@ public: ...@@ -240,7 +240,7 @@ public:
{ {
// format to wmemory_buffer and convert to utf8 // format to wmemory_buffer and convert to utf8
fmt::wmemory_buffer wbuf; fmt::wmemory_buffer wbuf;
fmt::format_to(std::back_inserter(wbuf), fmt, std::forward<Args>(args)...); fmt::format_to(std::back_inserter(wbuf), fmt::runtime(fmt), std::forward<Args>(args)...);
memory_buf_t buf; memory_buf_t buf;
details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf);
...@@ -270,8 +270,8 @@ public: ...@@ -270,8 +270,8 @@ public:
} }
SPDLOG_LOGGER_CATCH() SPDLOG_LOGGER_CATCH()
} }
#endif // _WIN32 # endif // _WIN32
#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT #endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
// return true logging is enabled for the given level. // return true logging is enabled for the given level.
bool should_log(level::level_enum msg_level) const bool should_log(level::level_enum msg_level) const
...@@ -340,7 +340,7 @@ protected: ...@@ -340,7 +340,7 @@ protected:
SPDLOG_TRY SPDLOG_TRY
{ {
memory_buf_t buf; memory_buf_t buf;
fmt::format_to(std::back_inserter(buf), fmt, std::forward<Args>(args)...); fmt::format_to(std::back_inserter(buf), fmt::runtime(fmt), std::forward<Args>(args)...);
details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size()));
log_it_(log_msg, log_enabled, traceback_enabled); log_it_(log_msg, log_enabled, traceback_enabled);
} }
...@@ -365,5 +365,5 @@ void swap(logger &a, logger &b); ...@@ -365,5 +365,5 @@ void swap(logger &a, logger &b);
} // namespace spdlog } // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY #ifdef SPDLOG_HEADER_ONLY
#include "logger-inl.h" # include "logger-inl.h"
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment