From cf5f3da0df5eb7291bfa853c3dd8b9ae7b71d610 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Tue, 14 Jul 2020 12:50:34 -0300 Subject: [PATCH] Cleanup c-style casts from Socket.cpp --- src/openrct2/network/Socket.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/openrct2/network/Socket.cpp b/src/openrct2/network/Socket.cpp index 37a39c1d7e..b201668fa2 100644 --- a/src/openrct2/network/Socket.cpp +++ b/src/openrct2/network/Socket.cpp @@ -915,8 +915,8 @@ static std::vector GetNetworkInterfaces() { interfaces.resize(capacity); if (WSAIoctl( - sock, SIO_GET_INTERFACE_LIST, nullptr, 0, interfaces.data(), (DWORD)(capacity * sizeof(INTERFACE_INFO)), &len, - nullptr, nullptr) + sock, SIO_GET_INTERFACE_LIST, nullptr, 0, interfaces.data(), + static_cast(capacity * sizeof(INTERFACE_INFO)), &len, nullptr, nullptr) == 0) { break; @@ -949,9 +949,10 @@ std::vector> GetBroadcastAddresses() // iiBroadcast is unusable, because it always seems to be set to 255.255.255.255. sockaddr_storage address{}; memcpy(&address, &ifo.iiAddress.Address, sizeof(sockaddr)); - ((sockaddr_in*)&address)->sin_addr.s_addr = ifo.iiAddress.AddressIn.sin_addr.s_addr + (reinterpret_cast(&address))->sin_addr.s_addr = ifo.iiAddress.AddressIn.sin_addr.s_addr | ~ifo.iiNetmask.AddressIn.sin_addr.s_addr; - baddresses.push_back(std::make_unique((const sockaddr*)&address, (socklen_t)sizeof(sockaddr))); + baddresses.push_back(std::make_unique( + reinterpret_cast(&address), static_cast(sizeof(sockaddr)))); } # else int sock = socket(AF_INET, SOCK_DGRAM, 0);