From 0fcd42e4358abbc9743d0f58ad6801e2a8b2039c Mon Sep 17 00:00:00 2001
From: Roland Coeurjoly <rolandcoeurjoly@gmail.com>
Date: Wed, 22 May 2024 21:28:26 +0200
Subject: [PATCH] WIP

---
 kernel/drivertools.h | 78 ++++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/kernel/drivertools.h b/kernel/drivertools.h
index 065431fa491..0a9fd0312f5 100644
--- a/kernel/drivertools.h
+++ b/kernel/drivertools.h
@@ -140,45 +140,6 @@ struct DriveBitMarker
 
 };
 
-struct DriveBitMultiple
-{
-private:
-	pool<DriveBit> multiple_;
-
-public:
-	DriveBitMultiple() {}
-	DriveBitMultiple(DriveBit const &single)
-	{
-		multiple_.emplace(single);
-	}
-
-	pool<DriveBit> const &multiple() const { return multiple_; }
-
-	void merge(DriveBitMultiple const &other)
-	{
-		for (DriveBit const &single : other.multiple_)
-			merge(single);
-	}
-
-	void merge(DriveBitMultiple &&other)
-	{
-		for (DriveBit &single : other.multiple_)
-			merge(std::move(single));
-	}
-
-	void merge(DriveBit const &single);
-	void merge(DriveBit &&single);
-
-	bool operator==(const DriveBitMultiple &other) const
-	{
-		return multiple_ == other.multiple_;
-	}
-
-	unsigned int hash() const
-	{
-	   return multiple_.hash();
-	}
-};
 
 struct DriveBit
 {
@@ -467,6 +428,45 @@ struct DriveBit
 
 };
 
+struct DriveBitMultiple
+{
+private:
+	pool<DriveBit> multiple_;
+
+public:
+	DriveBitMultiple() {}
+	DriveBitMultiple(DriveBit const &single)
+	{
+		multiple_.emplace(single);
+	}
+
+	pool<DriveBit> const &multiple() const { return multiple_; }
+
+	void merge(DriveBitMultiple const &other)
+	{
+		for (DriveBit const &single : other.multiple_)
+			merge(single);
+	}
+
+	void merge(DriveBitMultiple &&other)
+	{
+		for (DriveBit &single : other.multiple_)
+			merge(std::move(single));
+	}
+
+	void merge(DriveBit const &single);
+	void merge(DriveBit &&single);
+
+	bool operator==(const DriveBitMultiple &other) const
+	{
+		return multiple_ == other.multiple_;
+	}
+
+	unsigned int hash() const
+	{
+	   return multiple_.hash();
+	}
+};
 
 struct DriveChunkWire
 {