From: Erwan Velu <erwan@redhat.com>
Date: Mon, 11 Jun 2018 14:20:01 +0000 (+0200)
Subject: test/encoding/types.h: Adjusting src/rgw entries
X-Git-Tag: v14.0.1~1127^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef3b57cd89c6115ac806ad0a205ee35807dd3257;p=ceph.git

test/encoding/types.h: Adjusting src/rgw entries

This patch is about:
- Adding the missing headers from src/rgw
- Adding the missing types from the existing headers
- Ordering types to get them in the file's order (that's easier to update)

Signed-off-by: Erwan Velu <erwan@redhat.com>
---

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 089d6631d5cc..a9da265d228b 100644
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -337,13 +337,13 @@ TYPE(rbd::mirror::image_map::PolicyData)
 #ifdef WITH_RADOSGW
 
 #include "rgw/rgw_rados.h"
+TYPE(RGWOLHInfo)
 TYPE(RGWObjManifestPart)
 TYPE(RGWObjManifest)
-TYPE(RGWOLHInfo)
-TYPE(RGWZoneGroup)
+TYPE(RGWZoneParams)
 TYPE(RGWZone)
-TYPE(RGWZoneParams)     
-   
+TYPE(RGWZoneGroup)
+
 #include "rgw/rgw_acl.h"
 TYPE(ACLPermission)
 TYPE(ACLGranteeType)
@@ -443,7 +443,7 @@ TYPE(rgw_obj)
 #include "rgw/rgw_log.h"
 TYPE(rgw_log_entry)
 
-#include "rgw/rgw_sync.h"
+#include "rgw/rgw_meta_sync_status.h"
 TYPE(rgw_meta_sync_info)
 TYPE(rgw_meta_sync_marker)
 TYPE(rgw_meta_sync_status)