Merge pull request #12270 from AdmiralCurtiss/clang-enum-out-of-range-2

Netplay: Fix building on clang 17.
dolphin-emu · Nov 3, 2023 · c7243c3 · c7243c3
2 parents 7dae4dd + b181842
commit c7243c3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Source/Core/Common/ENet.cpp b/Source/Core/Common/ENet.cpp
@@ -31,7 +31,7 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
   // wakeup packet received
   if (host->receivedDataLength == 1 && host->receivedData[0] == 0)
   {
-    event->type = SKIPPABLE_EVENT;
+    event->type = static_cast<ENetEventType>(SKIPPABLE_EVENT);
     return 1;
   }
   return 0;

diff --git a/Source/Core/Common/ENet.h b/Source/Core/Common/ENet.h
@@ -23,5 +23,5 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
 bool SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id);
 
 // used for traversal packets and wake-up packets
-constexpr ENetEventType SKIPPABLE_EVENT = ENetEventType(42);
+constexpr int SKIPPABLE_EVENT = 42;
 }  // namespace Common::ENet
diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp
@@ -299,7 +299,7 @@ int ENET_CALLBACK TraversalClient::InterceptCallback(ENetHost* host, ENetEvent*
                                   &host->receivedAddress) ||
       (host->receivedDataLength == 1 && host->receivedData[0] == 0))
   {
-    event->type = Common::ENet::SKIPPABLE_EVENT;
+    event->type = static_cast<ENetEventType>(Common::ENet::SKIPPABLE_EVENT);
     return 1;
   }
   return 0;

diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
@@ -257,7 +257,7 @@ bool NetPlayClient::Connect()
   ENetEvent netEvent;
   int net;
   while ((net = enet_host_service(m_client, &netEvent, 5000)) > 0 &&
-         netEvent.type == Common::ENet::SKIPPABLE_EVENT)
+         static_cast<int>(netEvent.type) == Common::ENet::SKIPPABLE_EVENT)
   {
     // ignore packets from traversal server
   }
@@ -1645,7 +1645,7 @@ void NetPlayClient::ThreadFunc()
         break;
       default:
         // not a valid switch case due to not technically being part of the enum
-        if (netEvent.type == Common::ENet::SKIPPABLE_EVENT)
+        if (static_cast<int>(netEvent.type) == Common::ENet::SKIPPABLE_EVENT)
           INFO_LOG_FMT(NETPLAY, "enet_host_service: skippable packet event");
         else
           ERROR_LOG_FMT(NETPLAY, "enet_host_service: unknown event type: {}", int(netEvent.type));

diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
@@ -387,7 +387,7 @@ void NetPlayServer::ThreadFunc()
       break;
       default:
         // not a valid switch case due to not technically being part of the enum
-        if (netEvent.type == Common::ENet::SKIPPABLE_EVENT)
+        if (static_cast<int>(netEvent.type) == Common::ENet::SKIPPABLE_EVENT)
           INFO_LOG_FMT(NETPLAY, "enet_host_service: skippable packet event");
         else
           ERROR_LOG_FMT(NETPLAY, "enet_host_service: unknown event type: {}", int(netEvent.type));