fix MSVC version check #if statements

This commit is contained in:
Walter Gray 2020-11-30 19:23:41 -08:00
parent 7f1c0411d6
commit d343e4ba7b

View File

@ -770,8 +770,8 @@ template <typename Char, typename Rep, typename OutputIt,
OutputIt format_duration_value(OutputIt out, Rep val, int) {
static FMT_CONSTEXPR_DECL const Char format[] = {'{', '}', 0};
// Workaround a compiler error in MSVC < 16.8.2
#if defined(FMT_MSC_VER) && FMT_MSC_VER <= 1928
// Workaround a compiler error in MSVC <= 16.8.2
#if FMT_MSC_VER && FMT_MSC_VER <= 1928
return vformat_to(out, to_string_view(format),
make_format_args<buffer_context<Char>>(val));
#else
@ -785,7 +785,7 @@ OutputIt format_duration_value(OutputIt out, Rep val, int precision) {
static FMT_CONSTEXPR_DECL const Char pr_f[] = {'{', ':', '.', '{',
'}', 'f', '}', 0};
if (precision >= 0) {
#if defined(FMT_MSC_VER) && FMT_MSC_VER <= 1928
#if FMT_MSC_VER && FMT_MSC_VER <= 1928
return vformat_to(out, to_string_view(pr_f),
make_format_args<buffer_context<Char>>(val, precision));
#else
@ -794,7 +794,7 @@ OutputIt format_duration_value(OutputIt out, Rep val, int precision) {
}
static FMT_CONSTEXPR_DECL const Char fp_f[] = {'{', ':', 'g', '}', 0};
#if defined(FMT_MSC_VER) && FMT_MSC_VER <= 1928
#if FMT_MSC_VER && FMT_MSC_VER <= 1928
return vformat_to(out, to_string_view(fp_f),
make_format_args<buffer_context<Char>>(val));
#else
@ -821,7 +821,7 @@ OutputIt format_duration_unit(OutputIt out) {
return copy_unit(string_view(unit), out, Char());
static FMT_CONSTEXPR_DECL const Char num_f[] = {'[', '{', '}', ']', 's', 0};
if (const_check(Period::den == 1)) {
#if defined(FMT_MSC_VER) && FMT_MSC_VER <= 1928
#if FMT_MSC_VER && FMT_MSC_VER <= 1928
return vformat_to(out, to_string_view(num_f),
make_format_args<buffer_context<Char>>(Period::num));
#else
@ -830,7 +830,7 @@ OutputIt format_duration_unit(OutputIt out) {
}
static FMT_CONSTEXPR_DECL const Char num_def_f[] = {'[', '{', '}', '/', '{',
'}', ']', 's', 0};
#if defined(FMT_MSC_VER) && FMT_MSC_VER <= 1928
#if FMT_MSC_VER && FMT_MSC_VER <= 1928
return vformat_to(
out, to_string_view(num_def_f),
make_format_args<buffer_context<Char>>(Period::num, Period::den));