From: Matt Benjamin <mbenjamin@redhat.com>
Date: Sat, 19 Sep 2020 00:17:46 +0000 (-0400)
Subject: rgw: setup for inclusion of rgw_basic_types in rgw cls
X-Git-Tag: v18.1.0~698^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9ee09fc27fb2b9783cffb094360b6e8a93ce5506;p=ceph-ci.git

rgw: setup for inclusion of rgw_basic_types in rgw cls

In downstream 4.1 version this change moved rgw_pool, rgw_bucket,
and some related types--but these have already moved on more
recent branches.

Include rgw_basic_types.h only from cls_rgw_types.h (review).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
---

diff --git a/src/rgw/rgw_basic_types.cc b/src/rgw/rgw_basic_types.cc
index 178b00bf9f8..5a09c017f3d 100644
--- a/src/rgw/rgw_basic_types.cc
+++ b/src/rgw/rgw_basic_types.cc
@@ -13,6 +13,8 @@
 
 #include "common/ceph_json.h"
 #include "common/Formatter.h"
+#include "cls/user/cls_user_types.h"
+#include "cls/rgw/cls_rgw_types.h"
 
 using std::ostream;
 using std::string;
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 5443b07fdab..da1f654d0fd 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -26,6 +26,7 @@
 #include "rgw_acl.h"
 #include "rgw_bucket_layout.h"
 #include "rgw_cors.h"
+#include "rgw_basic_types.h"
 #include "rgw_iam_policy.h"
 #include "rgw_quota.h"
 #include "rgw_string.h"