ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6579 from lioncash/socket 

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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats 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
{
public:
WiiSocket() = default;
WiiSocket(const WiiSocket&) = delete;
WiiSocket(WiiSocket&&) = default;
~WiiSocket();
WiiSocket& operator=(const WiiSocket&) = delete;
WiiSocket& operator=(WiiSocket&&) = default;
private:
struct sockop
{
Request request;
@ -184,12 +193,6 @@ class WiiSocket
};
};
private:
s32 fd;
s32 wii_fd;
bool nonBlock;
std::list<sockop> pending_sockops;
friend class WiiSockMan;
void SetFd(s32 s);
void SetWiiFd(s32 s);
@ -200,10 +203,10 @@ private:
void DoSock(Request request, SSL_IOCTL type);
void Update(bool read, bool write, bool except);
bool IsValid() const { return fd >= 0; }
public:
WiiSocket() : fd(-1), nonBlock(false) {}
~WiiSocket();
void operator=(WiiSocket const&) = delete;
s32 fd = -1;
s32 wii_fd = -1;
bool nonBlock = false;
std::list<sockop> pending_sockops;
};
class WiiSockMan