mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-26 09:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a narrowing warning

Browse Source
This commit is contained in:
Victor Zverovich 2018-04-07 07:24:07 -07:00
parent 5859e58ba1
commit 5079f924d6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/fmt/format.h
View File

@ -930,6 +930,8 @@ inline unsigned count_digits(uint32_t n) {
// A functor that doesn't add a thousands separator. // A functor that doesn't add a thousands separator.
struct no_thousands_sep { struct no_thousands_sep {
typedef char char_type;
template <typename Char> template <typename Char>
void operator()(Char *) {} void operator()(Char *) {}
}; };
@ -944,11 +946,12 @@ class add_thousands_sep {
unsigned digit_index_; unsigned digit_index_;
public: public:
typedef Char char_type;
explicit add_thousands_sep(basic_string_view<Char> sep) explicit add_thousands_sep(basic_string_view<Char> sep)
: sep_(sep), digit_index_(0) {} : sep_(sep), digit_index_(0) {}
template <typename BufChar> void operator()(Char *&buffer) {
void operator()(BufChar *&buffer) {
if (++digit_index_ % 3 != 0) if (++digit_index_ % 3 != 0)
return; return;
buffer -= sep_.size(); buffer -= sep_.size();
@ -993,8 +996,9 @@ inline Char *format_decimal(Char *buffer, UInt value, unsigned num_digits,
template <typename UInt, typename Iterator, typename ThousandsSep> template <typename UInt, typename Iterator, typename ThousandsSep>
inline Iterator format_decimal( inline Iterator format_decimal(
Iterator out, UInt value, unsigned num_digits, ThousandsSep sep) { Iterator out, UInt value, unsigned num_digits, ThousandsSep sep) {
typedef typename ThousandsSep::char_type char_type;
// Buffer should be large enough to hold all digits (digits10 + 1) and null. // Buffer should be large enough to hold all digits (digits10 + 1) and null.
char buffer[std::numeric_limits<UInt>::digits10 + 2]; char_type buffer[std::numeric_limits<UInt>::digits10 + 2];
format_decimal(buffer, value, num_digits, sep); format_decimal(buffer, value, num_digits, sep);
return std::copy_n(buffer, num_digits, out); return std::copy_n(buffer, num_digits, out);
} }