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/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/zenserver/main.cpp') diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp index 43ddc14c9..6bab33d92 100644 --- a/src/zenserver/main.cpp +++ b/src/zenserver/main.cpp @@ -94,10 +94,10 @@ AppMain(int argc, char* argv[]) #if ZEN_WITH_TRACE TraceInit("zenserver"); - ServerOptions.HasTraceCommandlineOptions = GetTraceOptionsFromCommandline(/* out */ ServerOptions.TraceOptions); + ServerOptions.HasTraceCommandlineOptions = GetTraceOptionsFromCommandline(/* out */ ServerOptions.TraceCmdLineOptions); if (ServerOptions.HasTraceCommandlineOptions) { - TraceConfigure(ServerOptions.TraceOptions); + TraceConfigure(ServerOptions.TraceCmdLineOptions); } #endif // ZEN_WITH_TRACE -- cgit v1.2.3