From: Daniel Gryniewicz <dang@fprintf.net>
Date: Tue, 6 Aug 2024 12:19:20 +0000 (-0400)
Subject: RGW - Zipper: pull in upstream fix for zpp_bits
X-Git-Tag: v20.0.0~1336^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F59051%2Fhead;p=ceph.git

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>
---

diff --git a/src/rgw/driver/posix/zpp_bits.h b/src/rgw/driver/posix/zpp_bits.h
index c9e99ec59c2f..229b0d6d20d9 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();
             }