diff options
author | bunnei <bunneidev@gmail.com> | 2023-04-08 09:09:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-08 09:09:06 +0200 |
commit | 25c4ae6e111146386d59acd355cebe88c3d5331f (patch) | |
tree | aaedf79b8d1cdad3db4f1fcf76ffbb0aa9d4f460 /src/core | |
parent | Merge pull request #10028 from zhaobot/tx-update-20230404051754 (diff) | |
parent | general: fixes for gcc 13 (diff) | |
download | yuzu-25c4ae6e111146386d59acd355cebe88c3d5331f.tar yuzu-25c4ae6e111146386d59acd355cebe88c3d5331f.tar.gz yuzu-25c4ae6e111146386d59acd355cebe88c3d5331f.tar.bz2 yuzu-25c4ae6e111146386d59acd355cebe88c3d5331f.tar.lz yuzu-25c4ae6e111146386d59acd355cebe88c3d5331f.tar.xz yuzu-25c4ae6e111146386d59acd355cebe88c3d5331f.tar.zst yuzu-25c4ae6e111146386d59acd355cebe88c3d5331f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/internal_network/socket_proxy.h | 3 | ||||
-rw-r--r-- | src/core/internal_network/sockets.h | 13 |
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 { class ProxySocket : public SocketBase { public: - YUZU_NON_COPYABLE(ProxySocket); - YUZU_NON_MOVEABLE(ProxySocket); - explicit ProxySocket(RoomNetwork& room_network_) noexcept; ~ProxySocket() override; 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: SocketBase() = default; explicit SocketBase(SOCKET fd_) : fd{fd_} {} - virtual ~SocketBase() = default; - virtual SocketBase& operator=(const SocketBase&) = delete; - - // Avoid closing sockets implicitly - virtual SocketBase& operator=(SocketBase&&) noexcept = delete; + YUZU_NON_COPYABLE(SocketBase); + YUZU_NON_MOVEABLE(SocketBase); virtual Errno Initialize(Domain domain, Type type, Protocol protocol) = 0; @@ -109,14 +106,8 @@ public: ~Socket() override; - Socket(const Socket&) = delete; - Socket& operator=(const Socket&) = delete; - Socket(Socket&& rhs) noexcept; - // Avoid closing sockets implicitly - Socket& operator=(Socket&&) noexcept = delete; - Errno Initialize(Domain domain, Type type, Protocol protocol) override; Errno Close() override; |