Merge fe615bb8f2 into f1dfd59a41
This commit is contained in:
commit
e9d03c4d35
@ -432,7 +432,7 @@ class fmt::internal::ArgFormatter :
|
|||||||
|
|
||||||
void visit_char(int value) {
|
void visit_char(int value) {
|
||||||
if (spec_.type_ && spec_.type_ != 'c')
|
if (spec_.type_ && spec_.type_ != 'c')
|
||||||
fmt::internal::ReportUnknownType(spec_.type_, "char");
|
return visit_any_int(value);
|
||||||
typedef typename fmt::BasicWriter<Char>::CharPtr CharPtr;
|
typedef typename fmt::BasicWriter<Char>::CharPtr CharPtr;
|
||||||
CharPtr out = CharPtr();
|
CharPtr out = CharPtr();
|
||||||
if (spec_.width_ > 1) {
|
if (spec_.width_ > 1) {
|
||||||
|
|||||||
6
format.h
6
format.h
@ -571,8 +571,10 @@ struct Arg {
|
|||||||
// Integer types should go first,
|
// Integer types should go first,
|
||||||
INT, UINT, LONG_LONG, ULONG_LONG, LAST_INTEGER_TYPE = ULONG_LONG,
|
INT, UINT, LONG_LONG, ULONG_LONG, LAST_INTEGER_TYPE = ULONG_LONG,
|
||||||
// followed by floating-point types.
|
// followed by floating-point types.
|
||||||
DOUBLE, LONG_DOUBLE, LAST_NUMERIC_TYPE = LONG_DOUBLE,
|
DOUBLE, LONG_DOUBLE,
|
||||||
CHAR, STRING, WSTRING, POINTER, CUSTOM
|
// fringe number hybrid type
|
||||||
|
CHAR, LAST_NUMERIC_TYPE = CHAR,
|
||||||
|
STRING, WSTRING, POINTER, CUSTOM,
|
||||||
};
|
};
|
||||||
Type type;
|
Type type;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user