From ce576fca2fa72d74b78dd5cb0d474e5026edb6a0 Mon Sep 17 00:00:00 2001 From: Stefan Vigerske Date: Fri, 27 May 2022 11:01:34 +0200 Subject: [PATCH] make namespace explicit when accessing fmt from fmt::internal - for MSVC with /permissive- --- src/format.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/format.cc b/src/format.cc index 4ef822003..7cfdf3f55 100644 --- a/src/format.cc +++ b/src/format.cc @@ -96,7 +96,7 @@ inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) { va_end(args); return result; } -# define FMT_SNPRINTF fmt_snprintf +# define FMT_SNPRINTF fmt::fmt_snprintf #endif // _MSC_VER #if defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT) @@ -752,7 +752,7 @@ unsigned fmt::internal::PrintfFormatter::parse_header( spec.width_ = parse_nonnegative_int(s); } else if (*s == '*') { ++s; - spec.width_ = WidthHandler(spec).visit(get_arg(s)); + spec.width_ = fmt::WidthHandler(spec).visit(get_arg(s)); } return arg_index; } @@ -785,12 +785,12 @@ void fmt::internal::PrintfFormatter::format( spec.precision_ = static_cast(parse_nonnegative_int(s)); } else if (*s == '*') { ++s; - spec.precision_ = PrecisionHandler().visit(get_arg(s)); + spec.precision_ = fmt::PrecisionHandler().visit(get_arg(s)); } } Arg arg = get_arg(s, arg_index); - if (spec.flag(HASH_FLAG) && IsZeroInt().visit(arg)) + if (spec.flag(HASH_FLAG) && fmt::IsZeroInt().visit(arg)) spec.flags_ &= ~to_unsigned(HASH_FLAG); if (spec.fill_ == '0') { if (arg.type <= Arg::LAST_NUMERIC_TYPE) @@ -803,24 +803,24 @@ void fmt::internal::PrintfFormatter::format( switch (*s++) { case 'h': if (*s == 'h') - ArgConverter(arg, *++s).visit(arg); + fmt::ArgConverter(arg, *++s).visit(arg); else - ArgConverter(arg, *s).visit(arg); + fmt::ArgConverter(arg, *s).visit(arg); break; case 'l': if (*s == 'l') - ArgConverter(arg, *++s).visit(arg); + fmt::ArgConverter(arg, *++s).visit(arg); else - ArgConverter(arg, *s).visit(arg); + fmt::ArgConverter(arg, *s).visit(arg); break; case 'j': - ArgConverter(arg, *s).visit(arg); + fmt::ArgConverter(arg, *s).visit(arg); break; case 'z': - ArgConverter(arg, *s).visit(arg); + fmt::ArgConverter(arg, *s).visit(arg); break; case 't': - ArgConverter(arg, *s).visit(arg); + fmt::ArgConverter(arg, *s).visit(arg); break; case 'L': // printf produces garbage when 'L' is omitted for long double, no @@ -828,7 +828,7 @@ void fmt::internal::PrintfFormatter::format( break; default: --s; - ArgConverter(arg, *s).visit(arg); + fmt::ArgConverter(arg, *s).visit(arg); } // Parse type. @@ -843,7 +843,7 @@ void fmt::internal::PrintfFormatter::format( break; case 'c': // TODO: handle wchar_t - CharConverter(arg).visit(arg); + fmt::CharConverter(arg).visit(arg); break; } }