From f8e780b9dd6e492d20330d6876b4f3e6ce72ee88 Mon Sep 17 00:00:00 2001 From: "Bak, Jin Hyeong" Date: Mon, 23 Sep 2019 14:48:09 +0900 Subject: [PATCH] Fix #1239, Remove basic_string_view_t --- include/spdlog/common.h | 2 +- include/spdlog/details/os-inl.h | 2 +- include/spdlog/details/os.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/spdlog/common.h b/include/spdlog/common.h index ddd6fabe..97650d00 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -107,7 +107,7 @@ using memory_buf_t = fmt::basic_memory_buffer; #ifndef _WIN32 #error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows #else -using wstring_view_t = basic_string_view_t; +using wstring_view_t = fmt::basic_string_view; template struct is_convertible_to_wstring_view : std::is_convertible diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h index 01a8afd7..f436b0d1 100644 --- a/include/spdlog/details/os-inl.h +++ b/include/spdlog/details/os-inl.h @@ -424,7 +424,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(basic_string_view_t wstr, memory_buf_t &target) +SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target) { if (wstr.size() > static_cast(std::numeric_limits::max())) { diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h index 75cc7c9c..6d9dae13 100644 --- a/include/spdlog/details/os.h +++ b/include/spdlog/details/os.h @@ -86,7 +86,7 @@ bool is_color_terminal() SPDLOG_NOEXCEPT; bool in_terminal(FILE *file) SPDLOG_NOEXCEPT; #if (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32) -void wstr_to_utf8buf(basic_string_view_t wstr, memory_buf_t &target); +void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target); #endif } // namespace os