From a58da97f98697580bf128ed5723ba720cc30f0dc Mon Sep 17 00:00:00 2001 From: Stefan Boberg 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 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 * tag unreferenced variable to fix gcc compilation * fixes for various cases of naming members the same as their type --- src/zenserver/zenserver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/zenserver/zenserver.cpp') diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp index 2dd51d243..787f28693 100644 --- a/src/zenserver/zenserver.cpp +++ b/src/zenserver/zenserver.cpp @@ -124,12 +124,12 @@ ZenServerBase::Initialize(const ZenServerConfig& ServerOptions, ZenServerState:: EnqueueSigIntTimer(); - m_Http = CreateHttpServer(ServerOptions.HttpServerConfig); + m_Http = CreateHttpServer(ServerOptions.HttpConfig); int EffectiveBasePort = m_Http->Initialize(ServerOptions.BasePort, ServerOptions.DataDir); if (EffectiveBasePort == 0) { ZEN_WARN("Failed to initialize http service '{}' using base port {} and data dir '{}'", - ServerOptions.HttpServerConfig.ServerClass, + ServerOptions.HttpConfig.ServerClass, ServerOptions.BasePort, ServerOptions.DataDir); return -1; -- cgit v1.2.3