From 1489dd1deebaed4b9c248606561ae4d9b81ac560 Mon Sep 17 00:00:00 2001 From: Jacob Domagala Date: Fri, 19 Apr 2024 14:06:33 +0200 Subject: [PATCH] #2216: Fix compile errors when using newer fmt version --- src/vt/rdma/rdma_common.h | 7 +++++-- src/vt/topos/index/dense/dense_array.h | 10 +++++----- src/vt/vrt/collection/balance/temperedlb/criterion.h | 7 ++++--- tests/unit/lb/test_lbargs_enum_conv.nompi.cc | 6 ++++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/vt/rdma/rdma_common.h b/src/vt/rdma/rdma_common.h index 4080dca2a6..6a6654692f 100644 --- a/src/vt/rdma/rdma_common.h +++ b/src/vt/rdma/rdma_common.h @@ -120,7 +120,9 @@ static constexpr ByteType rdma_default_byte_size = sizeof(char); VT_FMT_NAMESPACE_BEGIN template <> -struct formatter<::vt::rdma::Type> : formatter { +struct formatter<::vt::rdma::Type> { + constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); } + template auto format(::vt::rdma::Type t, FormatContext& ctx) const { std::string_view name = "Unknown"; @@ -141,7 +143,8 @@ struct formatter<::vt::rdma::Type> : formatter { name = fmt::format( "{}", static_cast>(t)); } - return formatter::format(name, ctx); + + return fmt::format_to(ctx.out(), name); } }; diff --git a/src/vt/topos/index/dense/dense_array.h b/src/vt/topos/index/dense/dense_array.h index 76aeb1dda9..3a1870de9f 100644 --- a/src/vt/topos/index/dense/dense_array.h +++ b/src/vt/topos/index/dense/dense_array.h @@ -160,14 +160,14 @@ static_assert( VT_FMT_NAMESPACE_BEGIN template -struct formatter<::vt::index::DenseIndexArray> - : formatter { +struct formatter<::vt::index::DenseIndexArray> { + constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); } + template auto format( const ::vt::index::DenseIndexArray& idx, - FormatContext& ctx - ) const { - return formatter::format(idx.toString(), ctx); + FormatContext& ctx) const { + return fmt::format_to(ctx.out(), idx.toString()); } }; diff --git a/src/vt/vrt/collection/balance/temperedlb/criterion.h b/src/vt/vrt/collection/balance/temperedlb/criterion.h index b374aa7eb7..42e8b7befe 100644 --- a/src/vt/vrt/collection/balance/temperedlb/criterion.h +++ b/src/vt/vrt/collection/balance/temperedlb/criterion.h @@ -96,8 +96,9 @@ struct Criterion { VT_FMT_NAMESPACE_BEGIN template <> -struct formatter<::vt::vrt::collection::lb::CriterionEnum> - : formatter { +struct formatter<::vt::vrt::collection::lb::CriterionEnum> { + constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); } + template auto format(::vt::vrt::collection::lb::CriterionEnum c, FormatContext& ctx) const { std::string_view name = "Unknown"; @@ -109,7 +110,7 @@ struct formatter<::vt::vrt::collection::lb::CriterionEnum> name = "ModifiedGrapevine"; break; } - return formatter::format(name, ctx); + return fmt::format_to(ctx.out(), name); } }; diff --git a/tests/unit/lb/test_lbargs_enum_conv.nompi.cc b/tests/unit/lb/test_lbargs_enum_conv.nompi.cc index 60bd8f5e3d..9d0694b117 100644 --- a/tests/unit/lb/test_lbargs_enum_conv.nompi.cc +++ b/tests/unit/lb/test_lbargs_enum_conv.nompi.cc @@ -150,7 +150,9 @@ TEST_F(TestLBArgsEnumConverter, test_enum_converter_config) { VT_FMT_NAMESPACE_BEGIN template <> - struct formatter<::vt::tests::unit::DummyEnum> : formatter { + struct formatter<::vt::tests::unit::DummyEnum> { + constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); } + template auto format(::vt::tests::unit::DummyEnum c, FormatContext& ctx) const { std::string_view name = "Unknown"; @@ -165,7 +167,7 @@ VT_FMT_NAMESPACE_BEGIN name = "Three"; break; } - return formatter::format(name, ctx); + return fmt::format_to(ctx.out(), name); } }; VT_FMT_NAMESPACE_END