diff options
author | Subv <subv2112@gmail.com> | 2016-12-08 17:06:19 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2016-12-08 17:06:19 +0100 |
commit | f9bcf895103e5a6d99f5fe755bcac92b7781fd38 (patch) | |
tree | aebba4794da82175756a09e7d4d1de8d835bf412 /src/core/hle/kernel/server_session.cpp | |
parent | Return an error code when connecting to a saturated port. (diff) | |
download | yuzu-f9bcf895103e5a6d99f5fe755bcac92b7781fd38.tar yuzu-f9bcf895103e5a6d99f5fe755bcac92b7781fd38.tar.gz yuzu-f9bcf895103e5a6d99f5fe755bcac92b7781fd38.tar.bz2 yuzu-f9bcf895103e5a6d99f5fe755bcac92b7781fd38.tar.lz yuzu-f9bcf895103e5a6d99f5fe755bcac92b7781fd38.tar.xz yuzu-f9bcf895103e5a6d99f5fe755bcac92b7781fd38.tar.zst yuzu-f9bcf895103e5a6d99f5fe755bcac92b7781fd38.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/server_session.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index 3782cb493..f8bccadfd 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp @@ -18,7 +18,7 @@ ResultVal<SharedPtr<ServerSession>> ServerSession::Create(std::string name, std: server_session->name = std::move(name); server_session->signaled = false; - server_session->hle_handler = hle_handler; + server_session->hle_handler = std::move(hle_handler); return MakeResult<SharedPtr<ServerSession>>(std::move(server_session)); } @@ -46,8 +46,9 @@ ResultCode ServerSession::HandleSyncRequest() { return RESULT_SUCCESS; } -std::tuple<SharedPtr<ServerSession>, SharedPtr<ClientSession>> ServerSession::CreateSessionPair(const std::string& name, std::shared_ptr<Service::SessionRequestHandler> hle_handler) { - auto server_session = ServerSession::Create(name + "_Server", hle_handler).MoveFrom(); +ServerSession::SessionPair ServerSession::CreateSessionPair(const std::string& name, + std::shared_ptr<Service::SessionRequestHandler> hle_handler) { + auto server_session = ServerSession::Create(name + "_Server", std::move(hle_handler)).MoveFrom(); auto client_session = ClientSession::Create(server_session, name + "_Client").MoveFrom(); return std::make_tuple(std::move(server_session), std::move(client_session)); |