From cea08c7abcfc5dc76fab4caa140a3c00dc9a91c5 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Mon, 30 Jun 2014 17:46:14 -0700 Subject: [PATCH] Suppress more warnings. --- format.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/format.h b/format.h index 1a641406..a7b8658d 100644 --- a/format.h +++ b/format.h @@ -1499,6 +1499,7 @@ typename fmt::BasicWriter::CharPtr const char *prefix, unsigned prefix_size) { unsigned width = spec.width(); Alignment align = spec.align(); + Char fill = static_cast(spec.fill()); if (spec.precision() > static_cast(num_digits)) { // Octal prefix '0' is counted as a digit, so ignore it if precision // is specified. @@ -1512,12 +1513,12 @@ typename fmt::BasicWriter::CharPtr unsigned fill_size = width - number_size; if (align != ALIGN_LEFT) { CharPtr p = GrowBuffer(fill_size); - std::fill(p, p + fill_size, static_cast(spec.fill())); + std::fill(p, p + fill_size, fill); } CharPtr result = PrepareBufferForInt(num_digits, subspec, prefix, prefix_size); if (align == ALIGN_LEFT) { CharPtr p = GrowBuffer(fill_size); - std::fill(p, p + fill_size, spec.fill()); + std::fill(p, p + fill_size, fill); } return result; } @@ -1530,7 +1531,6 @@ typename fmt::BasicWriter::CharPtr CharPtr p = GrowBuffer(width); CharPtr end = p + width; // TODO: error if fill is not convertible to Char - Char fill = static_cast(spec.fill()); if (align == ALIGN_LEFT) { std::copy(prefix, prefix + prefix_size, p); p += size;