summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/client_port.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-04-06 07:41:43 +0200
committerLioncash <mathew1800@gmail.com>2019-04-06 07:42:03 +0200
commit7a7ffa602d9cae6f5fb25b83d5a107e576d82b06 (patch)
treea599221fe5fea442ca6e488f2fae7b0eab4d0c2d /src/core/hle/kernel/client_port.cpp
parentkernel/server_port: Return a std::pair from CreatePortPair() (diff)
downloadyuzu-7a7ffa602d9cae6f5fb25b83d5a107e576d82b06.tar
yuzu-7a7ffa602d9cae6f5fb25b83d5a107e576d82b06.tar.gz
yuzu-7a7ffa602d9cae6f5fb25b83d5a107e576d82b06.tar.bz2
yuzu-7a7ffa602d9cae6f5fb25b83d5a107e576d82b06.tar.lz
yuzu-7a7ffa602d9cae6f5fb25b83d5a107e576d82b06.tar.xz
yuzu-7a7ffa602d9cae6f5fb25b83d5a107e576d82b06.tar.zst
yuzu-7a7ffa602d9cae6f5fb25b83d5a107e576d82b06.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/client_port.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp
index aa432658e..744b1697d 100644
--- a/src/core/hle/kernel/client_port.cpp
+++ b/src/core/hle/kernel/client_port.cpp
@@ -2,8 +2,6 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include <tuple>
-
#include "core/hle/kernel/client_port.h"
#include "core/hle/kernel/client_session.h"
#include "core/hle/kernel/errors.h"
@@ -31,18 +29,18 @@ ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() {
active_sessions++;
// Create a new session pair, let the created sessions inherit the parent port's HLE handler.
- auto sessions = ServerSession::CreateSessionPair(kernel, server_port->GetName(), this);
+ auto [server, client] = ServerSession::CreateSessionPair(kernel, server_port->GetName(), this);
if (server_port->HasHLEHandler()) {
- server_port->GetHLEHandler()->ClientConnected(std::get<SharedPtr<ServerSession>>(sessions));
+ server_port->GetHLEHandler()->ClientConnected(server);
} else {
- server_port->AppendPendingSession(std::get<SharedPtr<ServerSession>>(sessions));
+ server_port->AppendPendingSession(server);
}
// Wake the threads waiting on the ServerPort
server_port->WakeupAllWaitingThreads();
- return MakeResult(std::get<SharedPtr<ClientSession>>(sessions));
+ return MakeResult(client);
}
void ClientPort::ConnectionClosed() {