From e1f6108789a7d65b5b8bd011d7faecbbb4f3f727 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 30 Jan 2024 17:03:29 +0100 Subject: [PATCH] Revert class forward declaration in {client,server}opcodes.h closes #14324 --- src/network/clientopcodes.h | 3 ++- src/network/serveropcodes.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/network/clientopcodes.h b/src/network/clientopcodes.h index 683d3534d..20bfc6697 100644 --- a/src/network/clientopcodes.h +++ b/src/network/clientopcodes.h @@ -20,10 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once +#include "client/client.h" #include "networkprotocol.h" class NetworkPacket; -class Client; +// Note: don't forward-declare Client here (#14324) enum ToClientConnectionState { TOCLIENT_STATE_NOT_CONNECTED, diff --git a/src/network/serveropcodes.h b/src/network/serveropcodes.h index c461da44a..275270ab9 100644 --- a/src/network/serveropcodes.h +++ b/src/network/serveropcodes.h @@ -20,10 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once +#include "server.h" #include "networkprotocol.h" class NetworkPacket; -class Server; +// Note: don't forward-declare Server here (#14324) enum ToServerConnectionState { TOSERVER_STATE_NOT_CONNECTED,