Merge pull request #679 from SecretsOTheP/master

Fixed Ubuntu 17.10 compile until FMT is updated
This commit is contained in:
Chris Miles 2017-12-25 13:46:18 -06:00 committed by GitHub
commit dfccb4a2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1719,6 +1719,8 @@ FMT_DEFINE_INT_FORMATTERS(unsigned long)
FMT_DEFINE_INT_FORMATTERS(LongLong)
FMT_DEFINE_INT_FORMATTERS(ULongLong)
#define CHAR_WIDTH 1
/**
\rst
Returns a string formatter that pads the formatted argument with the fill
@ -1823,7 +1825,7 @@ class ArgFormatterBase : public ArgVisitor<Impl, void> {
typedef typename BasicWriter<Char>::CharPtr CharPtr;
Char fill = internal::CharTraits<Char>::cast(spec_.fill());
CharPtr out = CharPtr();
const unsigned CHAR_WIDTH = 1;
if (spec_.width_ > CHAR_WIDTH) {
out = writer_.grow_buffer(spec_.width_);
if (spec_.align_ == ALIGN_RIGHT) {