From db1ee420e09d5c23767d72e63bb44934a85414d9 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Sat, 11 May 2024 20:02:22 -0700 Subject: [PATCH] Cleanup unicode check more --- include/fmt/base.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/fmt/base.h b/include/fmt/base.h index 1f00f5ec..a9ae1f51 100644 --- a/include/fmt/base.h +++ b/include/fmt/base.h @@ -427,9 +427,11 @@ constexpr auto is_utf8_enabled() -> bool { return sizeof("\u00A7") == 3 && uchar("\u00A7"[0]) == 0xC2 && uchar("\u00A7"[1]) == 0xA7; } -constexpr auto use_utf8() -> bool { return FMT_UNICODE || is_utf8_enabled(); } +constexpr auto use_utf8() -> bool { + return !FMT_MSC_VERSION || is_utf8_enabled(); +} -static_assert(!(FMT_UNICODE && FMT_MSC_VERSION && !is_utf8_enabled()), +static_assert(!FMT_UNICODE || use_utf8(), "Unicode support requires compiling with /utf-8"); template FMT_CONSTEXPR auto length(const Char* s) -> size_t {