From a58da97f98697580bf128ed5723ba720cc30f0dc Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan.boberg@epicgames.com>
Date: Sat, 1 Nov 2025 14:04:35 +0100
Subject: Various fixes to address issues flagged by gcc / non-UE toolchain
 build (#621)

* gcc: avoid using memset on nontrivial struct
* redundant `return std::move`
* fixed various compilation issues flagged by gcc
* fix issue in xmake.lua detecting whether we are building with the UE toolchain or not
* add GCC ignore -Wundef (comment is inaccurate)
* remove redundant std::move
* don't catch exceptions by value
* unreferenced variables
* initialize "by the book" instead of memset
* remove unused exception reference
* add #include <cstring> to fix gcc build
* explicitly poulate KeyValueMap by traversing input spans fixes gcc compilation
* remove unreferenced variable
* eliminate redundant `std::move` which gcc complains about
* fix gcc compilation by including <cstring>
* tag unreferenced variable to fix gcc compilation
* fixes for various cases of naming members the same as their type
---
 src/zenserver/storage/admin/admin.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/zenserver/storage/admin/admin.cpp')

diff --git a/src/zenserver/storage/admin/admin.cpp b/src/zenserver/storage/admin/admin.cpp
index 68b91825d..04f43d33a 100644
--- a/src/zenserver/storage/admin/admin.cpp
+++ b/src/zenserver/storage/admin/admin.cpp
@@ -164,7 +164,7 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 				return Req.ServerRequest().WriteResponse(HttpResponseCode::NotFound);
 			}
 
-			auto WriteState = [](CbObjectWriter& Obj, const JobQueue::State& State) {
+			auto WriteState = [](CbObjectWriter& Obj, const JobQueue::JobState& State) {
 				if (!State.CurrentOp.empty())
 				{
 					Obj.AddString(
@@ -207,7 +207,7 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 
 			switch (CurrentState->Status)
 			{
-				case JobQueue::Status::Queued:
+				case JobQueue::JobStatus::Queued:
 					{
 						CbObjectWriter Obj;
 						Obj.AddString("Name"sv, CurrentState->Name);
@@ -217,7 +217,7 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 						Req.ServerRequest().WriteResponse(HttpResponseCode::OK, Obj.Save());
 					}
 					break;
-				case JobQueue::Status::Running:
+				case JobQueue::JobStatus::Running:
 					{
 						CbObjectWriter Obj;
 						Obj.AddString("Name"sv, CurrentState->Name);
@@ -229,7 +229,7 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 						Req.ServerRequest().WriteResponse(HttpResponseCode::OK, Obj.Save());
 					}
 					break;
-				case JobQueue::Status::Aborted:
+				case JobQueue::JobStatus::Aborted:
 					{
 						CbObjectWriter Obj;
 						Obj.AddString("Name"sv, CurrentState->Name);
@@ -243,7 +243,7 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 						Req.ServerRequest().WriteResponse(HttpResponseCode::OK, Obj.Save());
 					}
 					break;
-				case JobQueue::Status::Completed:
+				case JobQueue::JobStatus::Completed:
 					{
 						CbObjectWriter Obj;
 						Obj.AddString("Name"sv, CurrentState->Name);
-- 
cgit v1.2.3