Better workaround for fmt's separator

FarGroup · Jun 26, 2021 · a09945c · a09945c
1 parent 248f4f3
commit a09945c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/far/format.cpp b/far/format.cpp
@@ -57,7 +57,20 @@ WARNING_DISABLE_GCC("-Wmissing-declarations")
 
 WARNING_DISABLE_CLANG("-Weverything")
 
-#define FMT_STATIC_THOUSANDS_SEPARATOR ::locale.thousand_separator()
+struct thousands_separator
+{
+	operator wchar_t() const
+	{
+		return ::locale.thousand_separator();
+	}
+
+	operator char() const
+	{
+		return static_cast<char>(operator wchar_t());
+	}
+};
+
+#define FMT_STATIC_THOUSANDS_SEPARATOR (thousands_separator{})
 
 #include "thirdparty/fmt/format.cc"
 

diff --git a/far/format.hpp b/far/format.hpp
@@ -51,10 +51,9 @@ WARNING_DISABLE_GCC("-Wctor-dtor-privacy")
 
 WARNING_DISABLE_CLANG("-Weverything")
 
+#define FMT_STATIC_THOUSANDS_SEPARATOR
 #include "thirdparty/fmt/fmt/format.h"
 #include "thirdparty/fmt/fmt/xchar.h"
-
-#define FMT_STATIC_THOUSANDS_SEPARATOR
 #include "thirdparty/fmt/fmt/ostream.h"
 #undef FMT_STATIC_THOUSANDS_SEPARATOR
 

diff --git a/far/thirdparty/fmt/fmt/format-inl.h b/far/thirdparty/fmt/fmt/format-inl.h
@@ -117,7 +117,7 @@ template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref loc) {
 #else
 template <typename Char>
 FMT_FUNC auto thousands_sep_impl(locale_ref) -> thousands_sep_result<Char> {
-  return {"\03", static_cast<Char>(FMT_STATIC_THOUSANDS_SEPARATOR)};
+  return {"\03", FMT_STATIC_THOUSANDS_SEPARATOR};
 }
 template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref) {
   return '.';