From 7fefcc188b439f79d3f98e57cce09d5c6077c022 Mon Sep 17 00:00:00 2001 From: Fabian Terhorst Date: Tue, 22 Oct 2024 11:41:47 +0200 Subject: [PATCH] fix(net): linux build --- .../citizen-server-impl/include/GameServer.h | 2 +- .../citizen-server-impl/src/state/ServerGameState.cpp | 2 +- code/components/net-base/include/Net.h | 4 ++-- .../components/net-base/include/SerializableProperty.h | 10 +++++----- code/tests/server/TestArrayUpdate.cpp | 2 +- code/tests/server/TestGameStateAckPacketHandler.cpp | 2 +- code/tests/server/TestGameStateNAckPacketHandler.cpp | 2 +- code/tests/server/TestHeHostHandler.cpp | 2 +- code/tests/server/TestIHostHandler.cpp | 2 +- code/tests/server/TestIQuitHandler.cpp | 2 +- code/tests/server/TestNetGameEvent.cpp | 2 +- code/tests/server/TestRequestObjectIds.cpp | 2 +- code/tests/server/TestRoutingHandler.cpp | 2 +- code/tests/server/TestServerCommand.cpp | 2 +- code/tests/server/TestServerEvent.cpp | 2 +- code/tests/server/TestStateBag.cpp | 2 +- code/tests/server/TestTimeSyncReq.cpp | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/code/components/citizen-server-impl/include/GameServer.h b/code/components/citizen-server-impl/include/GameServer.h index cedbec6be0..f4795a7e88 100644 --- a/code/components/citizen-server-impl/include/GameServer.h +++ b/code/components/citizen-server-impl/include/GameServer.h @@ -222,7 +222,7 @@ namespace fx void ProcessPacket(NetPeerBase* peer, ENetPacketPtr& packet); public: - using TPacketHandler = std::function; + using TPacketHandler = std::function; inline void SetPacketHandler(const TPacketHandler& handler) { diff --git a/code/components/citizen-server-impl/src/state/ServerGameState.cpp b/code/components/citizen-server-impl/src/state/ServerGameState.cpp index ba08a65dff..0c4b9cfaf0 100644 --- a/code/components/citizen-server-impl/src/state/ServerGameState.cpp +++ b/code/components/citizen-server-impl/src/state/ServerGameState.cpp @@ -7721,7 +7721,7 @@ static InitFunction initFunction([]() auto gameServer = instance->GetComponent(); - gameServer->GetComponent()->Add(HashRageString("msgNetGameEvent"), { fx::ThreadIdx::Sync, [=](const fx::ClientSharedPtr& client, net::ByteReader& reader, fx::ENetPacketPtr& packet) + gameServer->GetComponent()->Add(HashRageString("msgNetGameEvent"), { fx::ThreadIdx::Sync, [=](const fx::ClientSharedPtr& client, net::ByteReader& reader, fx::ENetPacketPtr packet) { // this should match up with SendGameEventRaw on client builds // 1024 bytes is from the rlBuffer diff --git a/code/components/net-base/include/Net.h b/code/components/net-base/include/Net.h index 41e1dbbd11..50639644b6 100644 --- a/code/components/net-base/include/Net.h +++ b/code/components/net-base/include/Net.h @@ -46,7 +46,7 @@ inline Type hton(Type net) } else { - static_assert(false, "Unsupported type for hton"); + static_assert(!std::is_same_v, "Unsupported type for hton"); return Type{}; } } @@ -83,7 +83,7 @@ inline Type ntoh(Type net) } else { - static_assert(false, "Unsupported type for ntoh"); + static_assert(!std::is_same_v, "Unsupported type for ntoh"); return Type{}; } } diff --git a/code/components/net-base/include/SerializableProperty.h b/code/components/net-base/include/SerializableProperty.h index db66740a06..9630935ba9 100644 --- a/code/components/net-base/include/SerializableProperty.h +++ b/code/components/net-base/include/SerializableProperty.h @@ -146,7 +146,7 @@ namespace net if constexpr (SizeOption::kType != storage_type::SerializableSizeOption::Type::Value) { static_assert( - false, + !std::is_same_v, "serializable of a primitive type requires a SerializableSizeOptionValue when SizeOption is specified.") ; } @@ -193,7 +193,7 @@ namespace net storage_type::SerializableSizeOption::Type::Area) { static_assert( - false, + !std::is_same_v, "serializable of a std::string or std::string_view requires a SerializableSizeOptionArea."); } @@ -222,7 +222,7 @@ namespace net if constexpr (std::is_same() || SizeOption::kType != storage_type::SerializableSizeOption::Type::Area) { - static_assert(false, "serializable of a buffer requires a SerializableSizeOptionArea."); + static_assert(!std::is_same_v, "serializable of a buffer requires a SerializableSizeOptionArea."); } bool validSize; @@ -248,7 +248,7 @@ namespace net if constexpr (std::is_same() || SizeOption::kType != storage_type::SerializableSizeOption::Type::Area) { - static_assert(false, "serializable of a buffer requires a SerializableSizeOptionArea."); + static_assert(!std::is_same_v, "serializable of a buffer requires a SerializableSizeOptionArea."); } bool validSize; @@ -286,7 +286,7 @@ namespace net } else { - static_assert(false, "Unsupported property type"); + static_assert(!std::is_same_v, "Unsupported property type"); } return Success; diff --git a/code/tests/server/TestArrayUpdate.cpp b/code/tests/server/TestArrayUpdate.cpp index a4a21b5372..8d7a0269a3 100644 --- a/code/tests/server/TestArrayUpdate.cpp +++ b/code/tests/server/TestArrayUpdate.cpp @@ -8,7 +8,7 @@ #include "ByteReader.h" #include "ByteWriter.h" #include "ConsoleContextInstance.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "GameServer.h" #include "ServerGameStatePublicInstance.h" #include "ServerInstance.h" diff --git a/code/tests/server/TestGameStateAckPacketHandler.cpp b/code/tests/server/TestGameStateAckPacketHandler.cpp index 0ef9c9c2c6..1655f588cc 100644 --- a/code/tests/server/TestGameStateAckPacketHandler.cpp +++ b/code/tests/server/TestGameStateAckPacketHandler.cpp @@ -3,7 +3,7 @@ #include #include "ConsoleContextInstance.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "GameServer.h" #include "GameStateNAck.h" #include "NetBuffer.h" diff --git a/code/tests/server/TestGameStateNAckPacketHandler.cpp b/code/tests/server/TestGameStateNAckPacketHandler.cpp index 1178f14353..635ac61dab 100644 --- a/code/tests/server/TestGameStateNAckPacketHandler.cpp +++ b/code/tests/server/TestGameStateNAckPacketHandler.cpp @@ -3,7 +3,7 @@ #include #include "ConsoleContextInstance.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "GameServer.h" #include "GameStateNAck.h" #include "NetBuffer.h" diff --git a/code/tests/server/TestHeHostHandler.cpp b/code/tests/server/TestHeHostHandler.cpp index 93cf75876e..beef31ee30 100644 --- a/code/tests/server/TestHeHostHandler.cpp +++ b/code/tests/server/TestHeHostHandler.cpp @@ -4,7 +4,7 @@ #include "ByteReader.h" #include "ByteWriter.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "GameServer.h" #include "GameServerInstance.h" #include "HeHost.h" diff --git a/code/tests/server/TestIHostHandler.cpp b/code/tests/server/TestIHostHandler.cpp index 61c150f34a..b5a614d8da 100644 --- a/code/tests/server/TestIHostHandler.cpp +++ b/code/tests/server/TestIHostHandler.cpp @@ -4,7 +4,7 @@ #include "ByteReader.h" #include "ByteWriter.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "GameServer.h" #include "GameServerInstance.h" #include "ServerInstance.h" diff --git a/code/tests/server/TestIQuitHandler.cpp b/code/tests/server/TestIQuitHandler.cpp index 5e88634387..24d07fe805 100644 --- a/code/tests/server/TestIQuitHandler.cpp +++ b/code/tests/server/TestIQuitHandler.cpp @@ -4,7 +4,7 @@ #include "ByteReader.h" #include "ByteWriter.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "GameServer.h" #include "GameServerInstance.h" #include "ServerInstance.h" diff --git a/code/tests/server/TestNetGameEvent.cpp b/code/tests/server/TestNetGameEvent.cpp index 112bab5c96..7c8d3896a3 100644 --- a/code/tests/server/TestNetGameEvent.cpp +++ b/code/tests/server/TestNetGameEvent.cpp @@ -8,7 +8,7 @@ #include "ByteReader.h" #include "ByteWriter.h" #include "ClientMetricData.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "GameServer.h" #include "NetGameEventPacket.h" #include "ServerInstance.h" diff --git a/code/tests/server/TestRequestObjectIds.cpp b/code/tests/server/TestRequestObjectIds.cpp index 926bb81c6c..31de03be5f 100644 --- a/code/tests/server/TestRequestObjectIds.cpp +++ b/code/tests/server/TestRequestObjectIds.cpp @@ -7,7 +7,7 @@ #include "ByteReader.h" #include "ClientMetricData.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "ObjectIds.h" #include "RoundToType.h" #include "ServerGameStatePublicInstance.h" diff --git a/code/tests/server/TestRoutingHandler.cpp b/code/tests/server/TestRoutingHandler.cpp index 226a194672..7367a547da 100644 --- a/code/tests/server/TestRoutingHandler.cpp +++ b/code/tests/server/TestRoutingHandler.cpp @@ -6,7 +6,7 @@ #include #include "ClientMetricData.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "ServerGameStatePublicInstance.h" #include "ServerInstance.h" #include "packethandlers/RoutingPacketHandler.h" diff --git a/code/tests/server/TestServerCommand.cpp b/code/tests/server/TestServerCommand.cpp index 512b3da491..6e03c318f8 100644 --- a/code/tests/server/TestServerCommand.cpp +++ b/code/tests/server/TestServerCommand.cpp @@ -4,7 +4,7 @@ #include "ByteWriter.h" #include "ConsoleContextInstance.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "GameServer.h" #include "ServerEventComponent.h" #include "ServerEventComponentInstance.h" diff --git a/code/tests/server/TestServerEvent.cpp b/code/tests/server/TestServerEvent.cpp index 60212a3f91..ff83d70868 100644 --- a/code/tests/server/TestServerEvent.cpp +++ b/code/tests/server/TestServerEvent.cpp @@ -11,7 +11,7 @@ #include -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "ServerInstance.h" #include "TestUtils.h" #include "packethandlers/ServerEventPacketHandler.h" diff --git a/code/tests/server/TestStateBag.cpp b/code/tests/server/TestStateBag.cpp index 8cba433911..d1ea06b29b 100644 --- a/code/tests/server/TestStateBag.cpp +++ b/code/tests/server/TestStateBag.cpp @@ -9,7 +9,7 @@ #include "ByteWriter.h" #include "ClientRegistry.h" #include "ConsoleContextInstance.h" -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "ResourceManagerInstance.h" #include "ServerInstance.h" #include "TestUtils.h" diff --git a/code/tests/server/TestTimeSyncReq.cpp b/code/tests/server/TestTimeSyncReq.cpp index 3e55da3978..e9def440bf 100644 --- a/code/tests/server/TestTimeSyncReq.cpp +++ b/code/tests/server/TestTimeSyncReq.cpp @@ -2,7 +2,7 @@ #include -#include "EnetPacketInstance.h" +#include "ENetPacketInstance.h" #include "GameServer.h" #include "ServerInstance.h" #include "packethandlers/TimeSyncReqPacketHandler.h"