ceph-dencoder: moved RBD types outside of RGW preprocessor guard

Fixes: http://tracker.ceph.com/issues/22321
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b00ac12f4045cd39ac9a436cf32d233d16bc3485)

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 9c9555bcddf013eb39532c3a6a7b593349848885..6d99eeb8e3a89bda8a9180f1e2597b77ed52a55b 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -399,6 +399,8 @@ TYPE(rgw_data_sync_info)
 TYPE(rgw_data_sync_marker)
 TYPE(rgw_data_sync_status)
 
+#endif
+
 #ifdef WITH_RBD
 #include "cls/rbd/cls_rbd.h"
 TYPE(cls_rbd_parent)
@@ -409,8 +411,6 @@ TYPE(cls::rbd::MirrorPeer)
 TYPE(cls::rbd::MirrorImage)
 #endif
 
-#endif
-
 #include "cls/lock/cls_lock_types.h"
 TYPE(rados::cls::lock::locker_id_t)
 TYPE_FEATUREFUL(rados::cls::lock::locker_info_t)