diff options
| author | Daniel Gryniewicz <dang@fprintf.net> | 2024-08-06 14:19:20 +0200 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@fprintf.net> | 2024-08-06 14:21:56 +0200 |
| commit | 9b8d72f15a9b3529d7700aca5aa09d681a1917e1 (patch) | |
| tree | b242180ab88d5ff9cdf4dab74a7027307608a825 | |
| parent | Merge pull request #59024 from zdover23/wip-doc-2024-08-05-README-building-ceph (diff) | |
| download | ceph-9b8d72f15a9b3529d7700aca5aa09d681a1917e1.tar.xz ceph-9b8d72f15a9b3529d7700aca5aa09d681a1917e1.zip | |
RGW - Zipper: pull in upstream fix for zpp_bits
zpp_bits included code that required a newere compiler. Pull in the
upstream fix from:
https://github.com/eyalz800/zpp_bits/pull/170
Fixes: https://tracker.ceph.com/issues/67321
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Diffstat (limited to '')
| -rw-r--r-- | src/rgw/driver/posix/zpp_bits.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rgw/driver/posix/zpp_bits.h b/src/rgw/driver/posix/zpp_bits.h index c9e99ec59c2..229b0d6d20d 100644 --- a/src/rgw/driver/posix/zpp_bits.h +++ b/src/rgw/driver/posix/zpp_bits.h @@ -3752,16 +3752,16 @@ struct bind_opaque requires(decltype(in.remaining_data()) & data) { (context.*Function)(data); }) { - struct _ + struct guard { decltype(in) archive; decltype(in.remaining_data()) data; - constexpr ~_() + constexpr ~guard() { archive.position() += data.size(); } - } _{in, in.remaining_data()}; - return (context.*Function)(_.data); + } guard{in, in.remaining_data()}; + return (context.*Function)(guard.data); } else { return (context.*Function)(); } @@ -3776,16 +3776,16 @@ struct bind_opaque requires(decltype(in.remaining_data()) & data) { Function(data); }) { - struct _ + struct guard { decltype(in) archive; decltype(in.remaining_data()) data; - constexpr ~_() + constexpr ~guard() { archive.position() += data.size(); } - } _{in, in.remaining_data()}; - return Function(_.data); + } guard{in, in.remaining_data()}; + return Function(guard.data); } else { return Function(); } |