mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-06 23:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Suppress more warnings.

Browse Source
This commit is contained in:
Victor Zverovich 2014-06-30 17:46:14 -07:00
parent eb034a0589
commit cea08c7abc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
format.h
View File

@ -1499,6 +1499,7 @@ typename fmt::BasicWriter<Char>::CharPtr
const char *prefix, unsigned prefix_size) { const char *prefix, unsigned prefix_size) {
unsigned width = spec.width(); unsigned width = spec.width();
Alignment align = spec.align(); Alignment align = spec.align();
Char fill = static_cast<Char>(spec.fill());
if (spec.precision() > static_cast<int>(num_digits)) { if (spec.precision() > static_cast<int>(num_digits)) {
// Octal prefix '0' is counted as a digit, so ignore it if precision // Octal prefix '0' is counted as a digit, so ignore it if precision
// is specified. // is specified.
@ -1512,12 +1513,12 @@ typename fmt::BasicWriter<Char>::CharPtr
unsigned fill_size = width - number_size; unsigned fill_size = width - number_size;
if (align != ALIGN_LEFT) { if (align != ALIGN_LEFT) {
CharPtr p = GrowBuffer(fill_size); CharPtr p = GrowBuffer(fill_size);
std::fill(p, p + fill_size, static_cast<Char>(spec.fill())); std::fill(p, p + fill_size, fill);
} }
CharPtr result = PrepareBufferForInt(num_digits, subspec, prefix, prefix_size); CharPtr result = PrepareBufferForInt(num_digits, subspec, prefix, prefix_size);
if (align == ALIGN_LEFT) { if (align == ALIGN_LEFT) {
CharPtr p = GrowBuffer(fill_size); CharPtr p = GrowBuffer(fill_size);
std::fill(p, p + fill_size, spec.fill()); std::fill(p, p + fill_size, fill);
} }
return result; return result;
} }
@ -1530,7 +1531,6 @@ typename fmt::BasicWriter<Char>::CharPtr
CharPtr p = GrowBuffer(width); CharPtr p = GrowBuffer(width);
CharPtr end = p + width; CharPtr end = p + width;
// TODO: error if fill is not convertible to Char // TODO: error if fill is not convertible to Char
Char fill = static_cast<Char>(spec.fill());
if (align == ALIGN_LEFT) { if (align == ALIGN_LEFT) {
std::copy(prefix, prefix + prefix_size, p); std::copy(prefix, prefix + prefix_size, p);
p += size; p += size;