From a5f5ff70e00862f76d9d645e9b278618ba1a62b0 Mon Sep 17 00:00:00 2001 From: gabime Date: Sat, 26 Jun 2021 17:58:45 +0300 Subject: [PATCH] Fixed clang c++20 compile --- include/spdlog/logger.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h index bcc8d6e1..a77ef78f 100644 --- a/include/spdlog/logger.h +++ b/include/spdlog/logger.h @@ -19,25 +19,25 @@ #include #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT -#include +# include #endif #include #include #ifndef SPDLOG_NO_EXCEPTIONS -#define SPDLOG_LOGGER_CATCH() \ - catch (const std::exception &ex) \ - { \ - err_handler_(ex.what()); \ - } \ - catch (...) \ - { \ - err_handler_("Rethrowing unknown exception in logger"); \ - throw; \ - } +# define SPDLOG_LOGGER_CATCH() \ + catch (const std::exception &ex) \ + { \ + err_handler_(ex.what()); \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } #else -#define SPDLOG_LOGGER_CATCH() +# define SPDLOG_LOGGER_CATCH() #endif namespace spdlog { @@ -223,9 +223,9 @@ public: } #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT -#ifndef _WIN32 -#error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows -#else +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# else template void log(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&...args) @@ -240,7 +240,7 @@ public: { // format to wmemory_buffer and convert to utf8 fmt::wmemory_buffer wbuf; - fmt::format_to(std::back_inserter(wbuf), fmt, std::forward(args)...); + fmt::format_to(std::back_inserter(wbuf), fmt::runtime(fmt), std::forward(args)...); memory_buf_t buf; details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); @@ -270,8 +270,8 @@ public: } SPDLOG_LOGGER_CATCH() } -#endif // _WIN32 -#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT // return true logging is enabled for the given level. bool should_log(level::level_enum msg_level) const @@ -340,7 +340,7 @@ protected: SPDLOG_TRY { memory_buf_t buf; - fmt::format_to(std::back_inserter(buf), fmt, std::forward(args)...); + fmt::format_to(std::back_inserter(buf), fmt::runtime(fmt), std::forward(args)...); details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); log_it_(log_msg, log_enabled, traceback_enabled); } @@ -365,5 +365,5 @@ void swap(logger &a, logger &b); } // namespace spdlog #ifdef SPDLOG_HEADER_ONLY -#include "logger-inl.h" +# include "logger-inl.h" #endif