piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 13:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Socket: Make use of std::erase_if

Browse Source
This commit is contained in:
Lioncash
2023-12-12 13:29:33 -05:00
parent 96eac73d11
commit e69ac2d43e
1 changed files with 48 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/IOS/Network/Socket.cpp
View File

@ -1047,10 +1047,7 @@ void WiiSockMan::UpdatePollCommands()
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
auto& memory = system.GetMemory(); auto& memory = system.GetMemory();
pending_polls.erase( std::erase_if(pending_polls, [&system, &memory, this](PollCommand& pcmd) {
std::remove_if(
pending_polls.begin(), pending_polls.end(),
[&system, &memory, this](PollCommand& pcmd) {
const auto request = Request(system, pcmd.request_addr); const auto request = Request(system, pcmd.request_addr);
auto& pfds = pcmd.wii_fds; auto& pfds = pcmd.wii_fds;
int ret = 0; int ret = 0;
@ -1099,14 +1096,12 @@ void WiiSockMan::UpdatePollCommands()
// memory.Write_U32(ufds[i].fd, request.buffer_out + 0xc*i); //fd // memory.Write_U32(ufds[i].fd, request.buffer_out + 0xc*i); //fd
// memory.Write_U32(events, request.buffer_out + 0xc*i + 4); //events // memory.Write_U32(events, request.buffer_out + 0xc*i + 4); //events
memory.Write_U32(revents, pcmd.buffer_out + 0xc * i + 8); // revents memory.Write_U32(revents, pcmd.buffer_out + 0xc * i + 8); // revents
DEBUG_LOG_FMT(IOS_NET, DEBUG_LOG_FMT(IOS_NET, "IOCTL_SO_POLL socket {} wevents {:08X} events {:08X} revents {:08X}",
"IOCTL_SO_POLL socket {} wevents {:08X} events {:08X} revents {:08X}",
i, revents, pfds[i].events, pfds[i].revents); i, revents, pfds[i].events, pfds[i].revents);
} }
GetIOS()->EnqueueIPCReply(request, ret); GetIOS()->EnqueueIPCReply(request, ret);
return true; return true;
}), });
pending_polls.end());
} }
void WiiSockMan::ToNativeAddrIn(const u8* addr, sockaddr_in* to) void WiiSockMan::ToNativeAddrIn(const u8* addr, sockaddr_in* to)