fix(net): linux build

citizenfx · Oct 22, 2024 · 7fefcc1 · 7fefcc1
1 parent 498bcf4
commit 7fefcc1
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 22 deletions.
diff --git 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<void(uint32_t packetId, const fx::ClientSharedPtr& client, net::ByteReader& packet, ENetPacketPtr packetPtr)>;
+		using TPacketHandler = std::function<void(uint32_t packetId, const fx::ClientSharedPtr& client, net::ByteReader& packet, ENetPacketPtr& packetPtr)>;
 
 		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
@@ -7721,7 +7721,7 @@ static InitFunction initFunction([]()
 
 		auto gameServer = instance->GetComponent<fx::GameServer>();
 
-		gameServer->GetComponent<fx::HandlerMapComponent>()->Add(HashRageString("msgNetGameEvent"), { fx::ThreadIdx::Sync, [=](const fx::ClientSharedPtr& client, net::ByteReader& reader, fx::ENetPacketPtr& packet)
+		gameServer->GetComponent<fx::HandlerMapComponent>()->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
@@ -46,7 +46,7 @@ inline Type hton(Type net)
 	}
 	else
 	{
-		static_assert(false, "Unsupported type for hton");
+		static_assert(!std::is_same_v<Type,Type>, "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<Type,Type>, "Unsupported type for ntoh");
 		return Type{};
 	}
 }

diff --git 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<Type,Type>,
 								"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<Type,Type>,
 						"serializable of a std::string or std::string_view requires a SerializableSizeOptionArea.");
 				}
 
@@ -222,7 +222,7 @@ namespace net
 				if constexpr (std::is_same<SizeOption, void>() || SizeOption::kType !=
 					storage_type::SerializableSizeOption::Type::Area)
 				{
-					static_assert(false, "serializable of a buffer requires a SerializableSizeOptionArea.");
+					static_assert(!std::is_same_v<Type,Type>, "serializable of a buffer requires a SerializableSizeOptionArea.");
 				}
 
 				bool validSize;
@@ -248,7 +248,7 @@ namespace net
 				if constexpr (std::is_same<SizeOption, void>() || SizeOption::kType !=
 					storage_type::SerializableSizeOption::Type::Area)
 				{
-					static_assert(false, "serializable of a buffer requires a SerializableSizeOptionArea.");
+					static_assert(!std::is_same_v<Type,Type>, "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<Type,Type>, "Unsupported property type");
 			}
 
 			return Success;

diff --git 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
@@ -3,7 +3,7 @@
 #include <catch_amalgamated.hpp>
 
 #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
@@ -3,7 +3,7 @@
 #include <catch_amalgamated.hpp>
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,7 @@
 #include <state/ServerGameStatePublic.h>
 
 #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
@@ -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
@@ -11,7 +11,7 @@
 
 #include <catch_amalgamated.hpp>
 
-#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
@@ -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
@@ -2,7 +2,7 @@
 
 #include <catch_amalgamated.hpp>
 
-#include "EnetPacketInstance.h"
+#include "ENetPacketInstance.h"
 #include "GameServer.h"
 #include "ServerInstance.h"
 #include "packethandlers/TimeSyncReqPacketHandler.h"