From 1cbf18ff8463946aa5a09ccf1d6873b222b912b6 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 10:26:51 +0100
Subject: Simplify worker with jthread

Moves thread collection to bottom of class so threads are joined before
job storage is destroyed.
---
 lib/worker.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/worker.h')

diff --git a/lib/worker.h b/lib/worker.h
index 136c50e..96593d9 100644
--- a/lib/worker.h
+++ b/lib/worker.h
@@ -33,13 +33,13 @@ private:
 private:
 	void worker();
 
-	using Threads = std::vector<std::thread>;
+	using Threads = std::vector<std::jthread>;
 	using ToDo = std::deque<WorkPtr>;
 
-	Threads threads;
 	ToDo todo;
 	std::counting_semaphore<16> todoLen;
 	std::mutex todoMutex;
+	Threads threads;
 
 	static Worker instance;
 };
-- 
cgit v1.2.3