mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-04-09 18:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable locale more

Browse Source
This commit is contained in:
Victor Zverovich 2024-08-29 15:04:25 -07:00
parent 7477dda28d
commit b3ccc2d210
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,13 +22,6 @@
#include "format.h" #include "format.h"
#ifdef FMT_USE_LOCALE
// Use the provided definition.
#elif defined(FMT_STATIC_THOUSANDS_SEPARATOR)
# define FMT_USE_LOCALE 0
#else
# define FMT_USE_LOCALE 1
#endif
#if FMT_USE_LOCALE #if FMT_USE_LOCALE
# include <locale> # include <locale>
#elif !defined(FMT_STATIC_THOUSANDS_SEPARATOR) #elif !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
@ -122,9 +115,9 @@ FMT_FUNC auto decimal_point_impl(locale_ref loc) -> Char {
return use_facet<numpunct<Char>>(loc.get<locale>()).decimal_point(); return use_facet<numpunct<Char>>(loc.get<locale>()).decimal_point();
} }
#if FMT_USE_LOCALE
FMT_FUNC auto write_loc(appender out, loc_value value, FMT_FUNC auto write_loc(appender out, loc_value value,
const format_specs& specs, locale_ref loc) -> bool { const format_specs& specs, locale_ref loc) -> bool {
#if FMT_USE_LOCALE
auto locale = loc.get<std::locale>(); auto locale = loc.get<std::locale>();
// We cannot use the num_put<char> facet because it may produce output in // We cannot use the num_put<char> facet because it may produce output in
// a wrong encoding. // a wrong encoding.
@ -132,12 +125,8 @@ FMT_FUNC auto write_loc(appender out, loc_value value,
if (std::has_facet<facet>(locale)) if (std::has_facet<facet>(locale))
return use_facet<facet>(locale).put(out, value, specs); return use_facet<facet>(locale).put(out, value, specs);
return facet(locale).put(out, value, specs); return facet(locale).put(out, value, specs);
#else
value.visit(loc_writer<>{
out, specs, std::string(1, FMT_STATIC_THOUSANDS_SEPARATOR), "\3", "."});
return true;
#endif
} }
#endif
} // namespace detail } // namespace detail
FMT_FUNC void report_error(const char* message) { FMT_FUNC void report_error(const char* message) {

10
include/fmt/format.h
View File

@ -799,6 +799,14 @@ using is_double_double = bool_constant<std::numeric_limits<T>::digits == 106>;
# define FMT_USE_FULL_CACHE_DRAGONBOX 0 # define FMT_USE_FULL_CACHE_DRAGONBOX 0
#endif #endif
#ifdef FMT_USE_LOCALE
// Use the provided definition.
#elif defined(FMT_STATIC_THOUSANDS_SEPARATOR)
# define FMT_USE_LOCALE 0
#else
# define FMT_USE_LOCALE 1
#endif
template <typename T, typename Enable = void> template <typename T, typename Enable = void>
struct is_locale : std::false_type {}; struct is_locale : std::false_type {};
template <typename T> template <typename T>
@ -2144,9 +2152,11 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
}); });
} }
#if FMT_USE_LOCALE
// Writes a localized value. // Writes a localized value.
FMT_API auto write_loc(appender out, loc_value value, const format_specs& specs, FMT_API auto write_loc(appender out, loc_value value, const format_specs& specs,
locale_ref loc) -> bool; locale_ref loc) -> bool;
#endif
template <typename OutputIt> template <typename OutputIt>
inline auto write_loc(OutputIt, loc_value, const format_specs&, locale_ref) inline auto write_loc(OutputIt, loc_value, const format_specs&, locale_ref)
-> bool { -> bool {