From: Adam C. Emerson <aemerson@redhat.com>
Date: Mon, 11 Jul 2022 15:52:09 +0000 (-0400)
Subject: rgw: Fix `rgw::sal::Bucket::empty` static method signatures
X-Git-Tag: v17.2.4~146^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e40ce4a3511e669e761da5f39d81b14e6cdbdeba;p=ceph.git

rgw: Fix `rgw::sal::Bucket::empty` static method signatures

`unique_ptr` overload should take by reference.

Both should be const.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit b1d3e6c00674ebf6bde08968789a426d65db73d9)

Conflicts:
	src/rgw/rgw_sal.h
 - `unique_ptr` overload of empty

Fixes: https://tracker.ceph.com/issues/56585
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h
index cc551a43fe91..9d02cbbfdf50 100644
--- a/src/rgw/rgw_sal.h
+++ b/src/rgw/rgw_sal.h
@@ -734,7 +734,9 @@ class Bucket {
     bool versioning_enabled() { return info.versioning_enabled(); }
 
     /** Check if a Bucket pointer is empty */
-    static bool empty(Bucket* b) { return (!b || b->empty()); }
+    static bool empty(const Bucket* b) { return (!b || b->empty()); }
+    /** Check if a Bucket unique pointer is empty */
+    static bool empty(const std::unique_ptr<Bucket>& b) { return (!b || b->empty()); }
     /** Clone a copy of this bucket.  Used when modification is necessary of the copy */
     virtual std::unique_ptr<Bucket> clone() = 0;