From 3d7a895d1970ffa6929561f7213da2ef54785875 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 27 Aug 2022 11:31:07 +0800 Subject: [PATCH] include/object_fmt: mark fmt::formatter<>::format() const so these formatters can be used in methods with `const` specifier. Signed-off-by: Kefu Chai --- src/include/object_fmt.h | 2 +- src/osd/osd_types_fmt.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/include/object_fmt.h b/src/include/object_fmt.h index d789930d44c..33df5e3fbd9 100644 --- a/src/include/object_fmt.h +++ b/src/include/object_fmt.h @@ -16,7 +16,7 @@ struct fmt::formatter { constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } template - auto format(const snapid_t& snp, FormatContext& ctx) + auto format(const snapid_t& snp, FormatContext& ctx) const { if (snp == CEPH_NOSNAP) { return fmt::format_to(ctx.out(), "head"); diff --git a/src/osd/osd_types_fmt.h b/src/osd/osd_types_fmt.h index 9124ac20208..fb555f3cb62 100644 --- a/src/osd/osd_types_fmt.h +++ b/src/osd/osd_types_fmt.h @@ -14,7 +14,7 @@ struct fmt::formatter { constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } template - auto format(const osd_reqid_t& req_id, FormatContext& ctx) + auto format(const osd_reqid_t& req_id, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}.{}:{}", req_id.name, req_id.inc, req_id.tid); @@ -26,7 +26,7 @@ struct fmt::formatter { constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } template - auto format(const pg_shard_t& shrd, FormatContext& ctx) + auto format(const pg_shard_t& shrd, FormatContext& ctx) const { if (shrd.is_undefined()) { return fmt::format_to(ctx.out(), "?"); @@ -43,7 +43,7 @@ struct fmt::formatter { constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } template - auto format(const eversion_t& ev, FormatContext& ctx) + auto format(const eversion_t& ev, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}'{}", ev.epoch, ev.version); } @@ -67,7 +67,7 @@ struct fmt::formatter { constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } template - auto format(const object_manifest_t& om, FormatContext& ctx) + auto format(const object_manifest_t& om, FormatContext& ctx) const { fmt::format_to(ctx.out(), "manifest({}", om.get_type_name()); if (om.is_redirect()) { @@ -84,7 +84,7 @@ struct fmt::formatter { constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } template - auto format(const object_info_t& oi, FormatContext& ctx) + auto format(const object_info_t& oi, FormatContext& ctx) const { fmt::format_to(ctx.out(), "{}({} {} {} s {} uv {}", oi.soid, oi.version, oi.last_reqid, (oi.flags ? oi.get_flag_string() : ""), oi.size, @@ -111,7 +111,7 @@ struct fmt::formatter { constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } template - auto format(const pg_t& pg, FormatContext& ctx) + auto format(const pg_t& pg, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}.{:x}", pg.pool(), pg.m_seed); } @@ -123,7 +123,7 @@ struct fmt::formatter { constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } template - auto format(const spg_t& spg, FormatContext& ctx) + auto format(const spg_t& spg, FormatContext& ctx) const { if (shard_id_t::NO_SHARD == spg.shard.id) { return fmt::format_to(ctx.out(), "{}", spg.pgid); @@ -138,7 +138,7 @@ struct fmt::formatter { constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } template - auto format(const pg_history_t& pgh, FormatContext& ctx) + auto format(const pg_history_t& pgh, FormatContext& ctx) const { fmt::format_to(ctx.out(), "ec={}/{} lis/c={}/{} les/c/f={}/{}/{} sis={}", -- 2.39.5