summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/sockets/bsd.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-02-12 03:57:23 +0100
committerGitHub <noreply@github.com>2021-02-12 03:57:23 +0100
commita0379c2db514b5276e11c847dc6c600fb0a0b5d6 (patch)
tree2047437fed26e8c6184aceaf0110729b38fd9421 /src/core/hle/service/sockets/bsd.cpp
parentMerge pull request #5869 from german77/mousePanning (diff)
parentbsd: Remove usage of optional emplace() with no arguments (diff)
downloadyuzu-a0379c2db514b5276e11c847dc6c600fb0a0b5d6.tar
yuzu-a0379c2db514b5276e11c847dc6c600fb0a0b5d6.tar.gz
yuzu-a0379c2db514b5276e11c847dc6c600fb0a0b5d6.tar.bz2
yuzu-a0379c2db514b5276e11c847dc6c600fb0a0b5d6.tar.lz
yuzu-a0379c2db514b5276e11c847dc6c600fb0a0b5d6.tar.xz
yuzu-a0379c2db514b5276e11c847dc6c600fb0a0b5d6.tar.zst
yuzu-a0379c2db514b5276e11c847dc6c600fb0a0b5d6.zip
Diffstat (limited to 'src/core/hle/service/sockets/bsd.cpp')
-rw-r--r--src/core/hle/service/sockets/bsd.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp
index 0b306b87a..78e9cd708 100644
--- a/src/core/hle/service/sockets/bsd.cpp
+++ b/src/core/hle/service/sockets/bsd.cpp
@@ -453,7 +453,8 @@ std::pair<s32, Errno> BSD::SocketImpl(Domain domain, Type type, Protocol protoco
return {-1, Errno::MFILE};
}
- FileDescriptor& descriptor = file_descriptors[fd].emplace();
+ file_descriptors[fd] = FileDescriptor{};
+ FileDescriptor& descriptor = *file_descriptors[fd];
// ENONMEM might be thrown here
LOG_INFO(Service, "New socket fd={}", fd);
@@ -548,7 +549,8 @@ std::pair<s32, Errno> BSD::AcceptImpl(s32 fd, std::vector<u8>& write_buffer) {
return {-1, Translate(bsd_errno)};
}
- FileDescriptor& new_descriptor = file_descriptors[new_fd].emplace();
+ file_descriptors[new_fd] = FileDescriptor{};
+ FileDescriptor& new_descriptor = *file_descriptors[new_fd];
new_descriptor.socket = std::move(result.socket);
new_descriptor.is_connection_based = descriptor.is_connection_based;