From 7e9385405ff7e3befffaf4d58dedaee935bb3412 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 5 Feb 2021 22:58:32 +0200 Subject: [PATCH] better numeric_limits<>::max/min fix when using SPDLOG_WCHAR_TO_UTF8_SUPPORT NOMINMAX macro doesn't work everytime for some reason --- include/spdlog/details/os-inl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h index 50a6b5aa..a701e13f 100644 --- a/include/spdlog/details/os-inl.h +++ b/include/spdlog/details/os-inl.h @@ -436,7 +436,7 @@ SPDLOG_INLINE bool in_terminal(FILE *file) SPDLOG_NOEXCEPT #if (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32) SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target) { - if (wstr.size() > static_cast(std::numeric_limits::max()) / 2 - 1) + if (wstr.size() > static_cast((std::numeric_limits::max)()) / 2 - 1) { throw_spdlog_ex("UTF-16 string is too big to be converted to UTF-8"); } @@ -471,7 +471,7 @@ SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target) SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target) { - if (str.size() > static_cast(std::numeric_limits::max()) - 1) + if (str.size() > static_cast((std::numeric_limits::max)()) - 1) { throw_spdlog_ex("UTF-8 string is too big to be converted to UTF-16"); }