Skip to content

Commit 9b8d72f

Browse files
committed
RGW - Zipper: pull in upstream fix for zpp_bits
zpp_bits included code that required a newere compiler. Pull in the upstream fix from: eyalz800/zpp_bits#170 Fixes: https://tracker.ceph.com/issues/67321 Signed-off-by: Daniel Gryniewicz <[email protected]>
1 parent be941ad commit 9b8d72f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/rgw/driver/posix/zpp_bits.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3752,16 +3752,16 @@ struct bind_opaque
37523752
requires(decltype(in.remaining_data()) & data) {
37533753
(context.*Function)(data);
37543754
}) {
3755-
struct _
3755+
struct guard
37563756
{
37573757
decltype(in) archive;
37583758
decltype(in.remaining_data()) data;
3759-
constexpr ~_()
3759+
constexpr ~guard()
37603760
{
37613761
archive.position() += data.size();
37623762
}
3763-
} _{in, in.remaining_data()};
3764-
return (context.*Function)(_.data);
3763+
} guard{in, in.remaining_data()};
3764+
return (context.*Function)(guard.data);
37653765
} else {
37663766
return (context.*Function)();
37673767
}
@@ -3776,16 +3776,16 @@ struct bind_opaque
37763776
requires(decltype(in.remaining_data()) & data) {
37773777
Function(data);
37783778
}) {
3779-
struct _
3779+
struct guard
37803780
{
37813781
decltype(in) archive;
37823782
decltype(in.remaining_data()) data;
3783-
constexpr ~_()
3783+
constexpr ~guard()
37843784
{
37853785
archive.position() += data.size();
37863786
}
3787-
} _{in, in.remaining_data()};
3788-
return Function(_.data);
3787+
} guard{in, in.remaining_data()};
3788+
return Function(guard.data);
37893789
} else {
37903790
return Function();
37913791
}

0 commit comments

Comments
 (0)