diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-04-06 01:36:50 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-04-06 01:36:53 -0400 |
| commit | 05243b30415f09d5ead3a16bfc49e0571943fa5b (patch) | |
| tree | 68f300f7b7f17715bb9cf866071d6a90ba8a9cb1 /src/core/hle/kernel/server_port.cpp | |
| parent | 9d8fa5f6e321aa9f5e636b23570a2a05e8357742 (diff) | |
kernel/server_port: Return a std::pair from CreatePortPair()
Returns the same type that the function name describes.
Diffstat (limited to 'src/core/hle/kernel/server_port.cpp')
| -rw-r--r-- | src/core/hle/kernel/server_port.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/kernel/server_port.cpp b/src/core/hle/kernel/server_port.cpp index 708fdf9e1a..02e7c60e62 100644 --- a/src/core/hle/kernel/server_port.cpp +++ b/src/core/hle/kernel/server_port.cpp @@ -39,9 +39,8 @@ void ServerPort::Acquire(Thread* thread) { ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); } -std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> ServerPort::CreatePortPair( - KernelCore& kernel, u32 max_sessions, std::string name) { - +ServerPort::PortPair ServerPort::CreatePortPair(KernelCore& kernel, u32 max_sessions, + std::string name) { SharedPtr<ServerPort> server_port(new ServerPort(kernel)); SharedPtr<ClientPort> client_port(new ClientPort(kernel)); @@ -51,7 +50,7 @@ std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> ServerPort::CreatePortP client_port->max_sessions = max_sessions; client_port->active_sessions = 0; - return std::make_tuple(std::move(server_port), std::move(client_port)); + return std::make_pair(std::move(server_port), std::move(client_port)); } } // namespace Kernel |
