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 178b00bf9f83dd2ccc0ff181f6b1bd9934b92279..5a09c017f3def3c6f63cad51021a0a131d3b7f05 100644 (file)
--- 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 5443b07fdab84ed374d0e69747efb665ab3e65cf..da1f654d0fde3770a13b18ea5445704b139d4f27 100644 (file)
--- 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"