summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2021-02-09 17:50:26 -0500
committerGravatar Lioncash2021-02-09 17:50:29 -0500
commit0cd40fb5239bc3df092e2e3d21e8a3acc661b55a (patch)
treebfeca36f8db67f039868349aa2270f537867c327 /src
parentam/controller: Remove [[fallthrough]] from unreachable path (diff)
downloadyuzu-0cd40fb5239bc3df092e2e3d21e8a3acc661b55a.tar.gz
yuzu-0cd40fb5239bc3df092e2e3d21e8a3acc661b55a.tar.xz
yuzu-0cd40fb5239bc3df092e2e3d21e8a3acc661b55a.zip
bsd: Remove usage of optional emplace() with no arguments
Clang 12 currently falls over in the face of this.
Diffstat (limited to 'src')
-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
453 return {-1, Errno::MFILE}; 453 return {-1, Errno::MFILE};
454 } 454 }
455 455
456 FileDescriptor& descriptor = file_descriptors[fd].emplace(); 456 file_descriptors[fd] = FileDescriptor{};
457 FileDescriptor& descriptor = *file_descriptors[fd];
457 // ENONMEM might be thrown here 458 // ENONMEM might be thrown here
458 459
459 LOG_INFO(Service, "New socket fd={}", fd); 460 LOG_INFO(Service, "New socket fd={}", fd);
@@ -548,7 +549,8 @@ std::pair<s32, Errno> BSD::AcceptImpl(s32 fd, std::vector<u8>& write_buffer) {
548 return {-1, Translate(bsd_errno)}; 549 return {-1, Translate(bsd_errno)};
549 } 550 }
550 551
551 FileDescriptor& new_descriptor = file_descriptors[new_fd].emplace(); 552 file_descriptors[new_fd] = FileDescriptor{};
553 FileDescriptor& new_descriptor = *file_descriptors[new_fd];
552 new_descriptor.socket = std::move(result.socket); 554 new_descriptor.socket = std::move(result.socket);
553 new_descriptor.is_connection_based = descriptor.is_connection_based; 555 new_descriptor.is_connection_based = descriptor.is_connection_based;
554 556