From: Yingxin Cheng Date: Mon, 6 Feb 2023 06:09:42 +0000 (+0800) Subject: crimson/net: fix fmt related compile issue X-Git-Tag: v18.1.0~375^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1bc5827275f0b4450fea63acb5cd9098a2f02b38;p=ceph-ci.git crimson/net: fix fmt related compile issue Signed-off-by: Yingxin Cheng --- diff --git a/src/crimson/net/io_handler.cc b/src/crimson/net/io_handler.cc index d0d532ed4db..de296e64e23 100644 --- a/src/crimson/net/io_handler.cc +++ b/src/crimson/net/io_handler.cc @@ -11,6 +11,7 @@ #include "crimson/net/chained_dispatchers.h" #include "crimson/net/SocketMessenger.h" #include "msg/Message.h" +#include "msg/msg_fmt.h" using namespace ceph::msgr::v2; using crimson::common::local_conf; @@ -519,9 +520,14 @@ IOHandler::read_message(utime_t throttle_stamp, std::size_t msg_size) logger().trace("{} got {} + {} + {} byte message," " envelope type={} src={} off={} seq={}", - conn, msg_frame.front_len(), msg_frame.middle_len(), - msg_frame.data_len(), current_header.type, conn.get_peer_name(), - current_header.data_off, current_header.seq); + conn, + msg_frame.front_len(), + msg_frame.middle_len(), + msg_frame.data_len(), + current_header.type, + conn.get_peer_name(), + current_header.data_off, + current_header.seq); ceph_msg_header header{current_header.seq, current_header.tid, diff --git a/src/crimson/net/io_handler.h b/src/crimson/net/io_handler.h index d7beb9ccb6f..e86667a04e5 100644 --- a/src/crimson/net/io_handler.h +++ b/src/crimson/net/io_handler.h @@ -267,3 +267,7 @@ struct fmt::formatter return formatter::format(name, ctx); } }; + +#if FMT_VERSION >= 90000 +template <> struct fmt::formatter : fmt::ostream_formatter {}; +#endif