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

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

This patch is about:
- Moving some common/ entries to keep them in a collocated place, and in the file order : that's easier to update this way.

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

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index a6780ee5d1fd..27675df9144a 100644
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -25,13 +25,16 @@ TYPE(BitVector<2>)
 TYPE(bloom_filter)
 TYPE(compressible_bloom_filter)
 
-#include "common/snap_types.h"
-TYPE(SnapContext)
-TYPE(SnapRealmInfo)
-
 #include "common/DecayCounter.h"
 TYPE(DecayCounter)
 
+#include "common/histogram.h"
+TYPE(pow2_hist_t)
+
+#include "common/hobject.h"
+TYPE(hobject_t)
+TYPE(ghobject_t)
+
 #include "common/LogEntry.h"
 TYPE_FEATUREFUL(LogEntry)
 TYPE_FEATUREFUL(LogSummary)
@@ -39,6 +42,10 @@ TYPE_FEATUREFUL(LogSummary)
 #include "common/SloppyCRCMap.h"
 TYPE(SloppyCRCMap)
 
+#include "common/snap_types.h"
+TYPE(SnapContext)
+TYPE(SnapRealmInfo)
+
 #include "msg/msg_types.h"
 TYPE(entity_name_t)
 TYPE_FEATUREFUL(entity_addr_t)
@@ -54,9 +61,6 @@ TYPE_FEATUREFUL_STRAYDATA(OSDMap::Incremental)
 #include "crush/CrushWrapper.h"
 TYPE_FEATUREFUL_NOCOPY(CrushWrapper)
 
-#include "common/histogram.h"
-TYPE(pow2_hist_t)
-
 #include "osd/osd_types.h"
 TYPE(osd_reqid_t)
 TYPE(object_locator_t)
@@ -144,10 +148,6 @@ TYPE(bluefs_super_t)
 TYPE(bluefs_transaction_t)
 #endif
 
-#include "common/hobject.h"
-TYPE(hobject_t)
-TYPE(ghobject_t)
-
 #include "mon/AuthMonitor.h"
 TYPE_FEATUREFUL(AuthMonitor::Incremental)