diff options
| author | Stefan Boberg <[email protected]> | 2025-11-01 14:04:35 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-11-01 14:04:35 +0100 |
| commit | a58da97f98697580bf128ed5723ba720cc30f0dc (patch) | |
| tree | 798e392ddf76128a506293dc0803aaf852203dcd /src/zenserver/config/config.h | |
| parent | fix use-after-free in TEST_CASE("compactcas.threadedinsert") (#620) (diff) | |
| download | zen-a58da97f98697580bf128ed5723ba720cc30f0dc.tar.xz zen-a58da97f98697580bf128ed5723ba720cc30f0dc.zip | |
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
Diffstat (limited to 'src/zenserver/config/config.h')
| -rw-r--r-- | src/zenserver/config/config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zenserver/config/config.h b/src/zenserver/config/config.h index 467f26ee7..40639da13 100644 --- a/src/zenserver/config/config.h +++ b/src/zenserver/config/config.h @@ -39,7 +39,7 @@ struct ZenSentryConfig struct ZenServerConfig { - HttpServerConfig HttpServerConfig; + HttpServerConfig HttpConfig; ZenSentryConfig SentryConfig; ZenStatsConfig StatsConfig; int BasePort = 8558; // Service listen port (used for both UDP and TCP) @@ -66,7 +66,7 @@ struct ZenServerConfig std::string Loggers[zen::logging::level::LogLevelCount]; #if ZEN_WITH_TRACE bool HasTraceCommandlineOptions = false; - TraceOptions TraceOptions; + TraceOptions TraceCmdLineOptions; #endif std::string MemoryOptions; // Memory allocation options std::string CommandLine; |