summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/internal_network/socket_proxy.h3
-rw-r--r--src/core/internal_network/sockets.h13
2 files changed, 2 insertions, 14 deletions
diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h
index 9421492bc..6e991fa38 100644
--- a/src/core/internal_network/socket_proxy.h
+++ b/src/core/internal_network/socket_proxy.h
@@ -16,9 +16,6 @@ namespace Network {
16 16
17class ProxySocket : public SocketBase { 17class ProxySocket : public SocketBase {
18public: 18public:
19 YUZU_NON_COPYABLE(ProxySocket);
20 YUZU_NON_MOVEABLE(ProxySocket);
21
22 explicit ProxySocket(RoomNetwork& room_network_) noexcept; 19 explicit ProxySocket(RoomNetwork& room_network_) noexcept;
23 ~ProxySocket() override; 20 ~ProxySocket() override;
24 21
diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h
index 4c7489258..11e479e50 100644
--- a/src/core/internal_network/sockets.h
+++ b/src/core/internal_network/sockets.h
@@ -36,13 +36,10 @@ public:
36 36
37 SocketBase() = default; 37 SocketBase() = default;
38 explicit SocketBase(SOCKET fd_) : fd{fd_} {} 38 explicit SocketBase(SOCKET fd_) : fd{fd_} {}
39
40 virtual ~SocketBase() = default; 39 virtual ~SocketBase() = default;
41 40
42 virtual SocketBase& operator=(const SocketBase&) = delete; 41 YUZU_NON_COPYABLE(SocketBase);
43 42 YUZU_NON_MOVEABLE(SocketBase);
44 // Avoid closing sockets implicitly
45 virtual SocketBase& operator=(SocketBase&&) noexcept = delete;
46 43
47 virtual Errno Initialize(Domain domain, Type type, Protocol protocol) = 0; 44 virtual Errno Initialize(Domain domain, Type type, Protocol protocol) = 0;
48 45
@@ -109,14 +106,8 @@ public:
109 106
110 ~Socket() override; 107 ~Socket() override;
111 108
112 Socket(const Socket&) = delete;
113 Socket& operator=(const Socket&) = delete;
114
115 Socket(Socket&& rhs) noexcept; 109 Socket(Socket&& rhs) noexcept;
116 110
117 // Avoid closing sockets implicitly
118 Socket& operator=(Socket&&) noexcept = delete;
119
120 Errno Initialize(Domain domain, Type type, Protocol protocol) override; 111 Errno Initialize(Domain domain, Type type, Protocol protocol) override;
121 112
122 Errno Close() override; 113 Errno Close() override;