piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6579 from lioncash/socket

Browse Source 
IOS/Socket: Minor changes to WiiSocket
This commit is contained in:
Léo Lam
2018-04-01 23:31:47 +02:00
committed by GitHub
parent c6931ee5b8 ad17d9a979
commit 7d561c7e0e
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/Core/IOS/Network/Socket.h
View File

@ -173,6 +173,15 @@ struct WiiSockAddrIn
class WiiSocket class WiiSocket
{ {
public:
WiiSocket() = default;
WiiSocket(const WiiSocket&) = delete;
WiiSocket(WiiSocket&&) = default;
~WiiSocket();
WiiSocket& operator=(const WiiSocket&) = delete;
WiiSocket& operator=(WiiSocket&&) = default;
private:
struct sockop struct sockop
{ {
Request request; Request request;
@ -184,12 +193,6 @@ class WiiSocket
}; };
}; };
private:
s32 fd;
s32 wii_fd;
bool nonBlock;
std::list<sockop> pending_sockops;
friend class WiiSockMan; friend class WiiSockMan;
void SetFd(s32 s); void SetFd(s32 s);
void SetWiiFd(s32 s); void SetWiiFd(s32 s);
@ -200,10 +203,10 @@ private:
void DoSock(Request request, SSL_IOCTL type); void DoSock(Request request, SSL_IOCTL type);
void Update(bool read, bool write, bool except); void Update(bool read, bool write, bool except);
bool IsValid() const { return fd >= 0; } bool IsValid() const { return fd >= 0; }
public: s32 fd = -1;
WiiSocket() : fd(-1), nonBlock(false) {} s32 wii_fd = -1;
~WiiSocket(); bool nonBlock = false;
void operator=(WiiSocket const&) = delete; std::list<sockop> pending_sockops;
}; };
class WiiSockMan class WiiSockMan