Skip to content

Commit ee6523b

Browse files
committed
Merge PR ceph#60106 into main
* refs/pull/60106/head: msg/async/ProtocolV2: pass `desc` as `std::string_view` to write() Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Radoslaw Zarzynski <[email protected]>
2 parents 4c38857 + 966920e commit ee6523b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/msg/async/ProtocolV2.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ CtPtr ProtocolV2::read(CONTINUATION_RXBPTR_TYPE<ProtocolV2> &next,
796796
}
797797

798798
template <class F>
799-
CtPtr ProtocolV2::write(const std::string &desc,
799+
CtPtr ProtocolV2::write(std::string_view desc,
800800
CONTINUATION_TYPE<ProtocolV2> &next,
801801
F &frame) {
802802
ceph::bufferlist bl;
@@ -812,7 +812,7 @@ CtPtr ProtocolV2::write(const std::string &desc,
812812
return write(desc, next, bl);
813813
}
814814

815-
CtPtr ProtocolV2::write(const std::string &desc,
815+
CtPtr ProtocolV2::write(std::string_view desc,
816816
CONTINUATION_TYPE<ProtocolV2> &next,
817817
ceph::bufferlist &buffer) {
818818
if (unlikely(pre_auth.enabled)) {

src/msg/async/ProtocolV2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ class ProtocolV2 : public Protocol {
135135
Ct<ProtocolV2> *read(CONTINUATION_RXBPTR_TYPE<ProtocolV2> &next,
136136
rx_buffer_t&& buffer);
137137
template <class F>
138-
Ct<ProtocolV2> *write(const std::string &desc,
138+
Ct<ProtocolV2> *write(std::string_view desc,
139139
CONTINUATION_TYPE<ProtocolV2> &next,
140140
F &frame);
141-
Ct<ProtocolV2> *write(const std::string &desc,
141+
Ct<ProtocolV2> *write(std::string_view desc,
142142
CONTINUATION_TYPE<ProtocolV2> &next,
143143
ceph::bufferlist &buffer);
144144

0 commit comments

Comments
 (0)