From: Alex Ainscow <aainscow@uk.ibm.com>
Date: Fri, 11 Apr 2025 09:41:37 +0000 (+0100)
Subject: rgw: Fix compilation issue with clang on centos
X-Git-Tag: testing/wip-rishabh-testing-20250412.190039~9^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fc081f175969f6c6e551b989ea61092f2a2fcf3e;p=ceph-ci.git

rgw: Fix compilation issue with clang on centos

We are getting a compilation issue with accessing an incomplete type.

This fix moves some code around to avoid this issue.

I don't fully understand why we don't see this issue everywhere!

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>
---

diff --git a/src/rgw/services/svc_notify.cc b/src/rgw/services/svc_notify.cc
index 6999aaa6a13..0fb2c18f3b9 100644
--- a/src/rgw/services/svc_notify.cc
+++ b/src/rgw/services/svc_notify.cc
@@ -22,13 +22,6 @@ using namespace std;
 
 static string notify_oid_prefix = "notify";
 
-RGWSI_Notify::RGWSI_Notify(CephContext *cct) : RGWServiceInstance(cct) {}
-RGWSI_Notify::~RGWSI_Notify()
-{
-  shutdown();
-}
-
-
 class RGWWatcher : public DoutPrefixProvider , public librados::WatchCtx2 {
   CephContext *cct;
   RGWSI_Notify *svc;
@@ -141,6 +134,11 @@ public:
   }
 };
 
+RGWSI_Notify::RGWSI_Notify(CephContext *cct) : RGWServiceInstance(cct) {}
+RGWSI_Notify::~RGWSI_Notify()
+{
+  shutdown();
+}
 
 class RGWSI_Notify_ShutdownCB : public RGWSI_Finisher::ShutdownCB
 {