Skip to content

Commit

Permalink
Merge pull request #6579 from lioncash/socket
Browse files Browse the repository at this point in the history
IOS/Socket: Minor changes to WiiSocket
  • Loading branch information
leoetlino committed Apr 1, 2018
2 parents c6931ee + ad17d9a commit 7d561c7
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions Source/Core/Core/IOS/Network/Socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -200,10 +203,10 @@ class WiiSocket
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
Expand Down

0 comments on commit 7d561c7

Please sign in to comment.