diff --git a/include/spdlog/common.h b/include/spdlog/common.h index 7987b085..fdfff8c1 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -17,7 +17,7 @@ #include #ifdef SPDLOG_USE_STD_FORMAT -#include +# include #endif #ifdef SPDLOG_COMPILED_LIB @@ -133,19 +133,18 @@ template using format_string_t = std::string_view; template -struct is_convertible_to_basic_format_string - : std::integral_constant>::value> +struct is_convertible_to_basic_format_string : std::integral_constant>::value> {}; # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) using wstring_view_t = std::wstring_view; -using memory_buf_t = std::wstring; +using wmemory_buf_t = std::wstring; template using wformat_string_t = std::wstring_view; # endif -#else + +#else // use fmt lib instead of std::format namespace fmt_lib = fmt; using string_view_t = fmt::basic_string_view; @@ -167,7 +166,8 @@ struct is_convertible_to_basic_format_string # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) using wstring_view_t = fmt::basic_string_view; -using wmemory_buf_t = fmt::basic_memory_buffer;; +using wmemory_buf_t = fmt::basic_memory_buffer; +; template using wformat_string_t = fmt::wformat_string; @@ -308,7 +308,12 @@ struct file_event_handlers std::function after_open; std::function before_close; std::function after_close; - file_event_handlers() : before_open{nullptr}, after_open{nullptr}, before_close{nullptr}, after_close{nullptr} {} + file_event_handlers() + : before_open{nullptr} + , after_open{nullptr} + , before_close{nullptr} + , after_close{nullptr} + {} }; namespace details {