feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Remove FMT_STATIC_THOUSANDS_SEPARATOR in favor of FMT_USE_LOCALE

Browse Source
This commit is contained in:
Victor Zverovich
2024-09-11 18:30:05 -07:00
parent a1d6f9a973
commit b90b4bc981
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/base.h
View File

@ -2286,12 +2286,8 @@ struct is_output_iterator<
void_t<decltype(*std::declval<decay_t<It>&>()++ = std::declval<T>())>> void_t<decltype(*std::declval<decay_t<It>&>()++ = std::declval<T>())>>
: std::true_type {}; : std::true_type {};
#ifdef FMT_USE_LOCALE #ifndef FMT_USE_LOCALE
// Use the provided definition. # define FMT_USE_LOCALE (FMT_OPTIMIZE_SIZE <= 1)
#elif defined(FMT_STATIC_THOUSANDS_SEPARATOR) || FMT_OPTIMIZE_SIZE > 1
# define FMT_USE_LOCALE 0
#else
# define FMT_USE_LOCALE 1
#endif #endif
// A type-erased reference to an std::locale to avoid a heavy <locale> include. // A type-erased reference to an std::locale to avoid a heavy <locale> include.

4
include/fmt/format-inl.h
View File

@ -24,8 +24,6 @@
#if FMT_USE_LOCALE #if FMT_USE_LOCALE
# include <locale> # include <locale>
#elif !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
# define FMT_STATIC_THOUSANDS_SEPARATOR ','
#endif #endif
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
@ -90,7 +88,7 @@ locale_ref::locale_ref(const Locale& loc) : locale_(&loc) {
struct locale {}; struct locale {};
template <typename Char> struct numpunct { template <typename Char> struct numpunct {
auto grouping() const -> std::string { return "\03"; } auto grouping() const -> std::string { return "\03"; }
auto thousands_sep() const -> Char { return FMT_STATIC_THOUSANDS_SEPARATOR; } auto thousands_sep() const -> Char { return ','; }
auto decimal_point() const -> Char { return '.'; } auto decimal_point() const -> Char { return '.'; }
}; };
template <typename Facet> Facet use_facet(locale) { return {}; } template <typename Facet> Facet use_facet(locale) { return {}; }