mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-08 11:33:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve formatting consistency

Browse Source
This commit is contained in:
Victor Zverovich 2016-05-19 13:36:00 -07:00
parent 559739ec1d
commit ebff26f8f1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fmt/format.h
View File

@ -911,10 +911,10 @@ class ThousandsSep {
}; };
// Returns the thousands separator for the current locale. // Returns the thousands separator for the current locale.
// On android the lconv structure is stubbed using an empty structure // On android the lconv structure is stubbed using an empty structure.
// The test is for the size only, not for the presense of // The test is for the size only, not for the presense of
// thousands_sep in std::lconv, because if one would add thousands_sep // thousands_sep in std::lconv, because if one would add thousands_sep
// at some point, the size of structure would be at least sizeof(char*) // at some point, the size of structure would be at least sizeof(char*).
template<typename Lconv, bool=(sizeof(Lconv) >= sizeof(char*))> template<typename Lconv, bool=(sizeof(Lconv) >= sizeof(char*))>
struct Locale { struct Locale {
static fmt::StringRef thousands_sep() { return ""; } static fmt::StringRef thousands_sep() { return ""; }
@ -922,7 +922,9 @@ struct Locale {
template<typename Lconv> template<typename Lconv>
struct Locale<Lconv, true> { struct Locale<Lconv, true> {
static fmt::StringRef thousands_sep() { return static_cast<Lconv*>(std::localeconv())->thousands_sep; } static fmt::StringRef thousands_sep() {
return static_cast<Lconv*>(std::localeconv())->thousands_sep;
}
}; };
// Formats a decimal unsigned integer value writing into buffer. // Formats a decimal unsigned integer value writing into buffer.
@ -2793,8 +2795,7 @@ void BasicWriter<Char>::write_int(T value, Spec spec) {
} }
case 'n': { case 'n': {
unsigned num_digits = internal::count_digits(abs_value); unsigned num_digits = internal::count_digits(abs_value);
fmt::StringRef sep = fmt::StringRef sep = internal::Locale<lconv>::thousands_sep();
internal::Locale<lconv>::thousands_sep();
unsigned size = static_cast<unsigned>( unsigned size = static_cast<unsigned>(
num_digits + sep.size() * (num_digits - 1) / 3); num_digits + sep.size() * (num_digits - 1) / 3);
CharPtr p = prepare_int_buffer(size, spec, prefix, prefix_size) + 1; CharPtr p = prepare_int_buffer(size, spec, prefix, prefix_size) + 1;