diff --git a/Source/Core/Core/IOS/Network/Socket.h b/Source/Core/Core/IOS/Network/Socket.h index c02cd2ee43..7299de5429 100644 --- a/Source/Core/Core/IOS/Network/Socket.h +++ b/Source/Core/Core/IOS/Network/Socket.h @@ -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 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 pending_sockops; }; class WiiSockMan