From 9ee09fc27fb2b9783cffb094360b6e8a93ce5506 Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Fri, 18 Sep 2020 20:17:46 -0400 Subject: [PATCH] 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 Signed-off-by: Daniel Gryniewicz --- src/rgw/rgw_basic_types.cc | 2 ++ src/rgw/rgw_common.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/rgw/rgw_basic_types.cc b/src/rgw/rgw_basic_types.cc index 178b00bf9f83..5a09c017f3de 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 5443b07fdab8..da1f654d0fde 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" -- 2.47.3