aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/client_session.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-11-24 20:15:51 -0500
committerGitHub <noreply@github.com>2019-11-24 20:15:51 -0500
commit9046d4a5485452802b756869b7d27056ba9ea9d7 (patch)
tree2d704d912e9054fb232b73ad69f1bc3966ed97a5 /src/core/hle/kernel/client_session.cpp
parentb03242067d9ba9e3ad9804d2ccfe596f45da6ba6 (diff)
kernel: Replace usage of boost::intrusive_ptr with std::shared_ptr for kernel objects. (#3154)
* kernel: Replace usage of boost::intrusive_ptr with std::shared_ptr for kernel objects. - See https://github.com/citra-emu/citra/pull/4710 for details.
Diffstat (limited to 'src/core/hle/kernel/client_session.cpp')
-rw-r--r--src/core/hle/kernel/client_session.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/core/hle/kernel/client_session.cpp b/src/core/hle/kernel/client_session.cpp
index c17baa50a..bc59d3306 100644
--- a/src/core/hle/kernel/client_session.cpp
+++ b/src/core/hle/kernel/client_session.cpp
@@ -16,25 +16,20 @@ ClientSession::ClientSession(KernelCore& kernel) : Object{kernel} {}
ClientSession::~ClientSession() {
// This destructor will be called automatically when the last ClientSession handle is closed by
// the emulated application.
-
- // A local reference to the ServerSession is necessary to guarantee it
- // will be kept alive until after ClientDisconnected() returns.
- SharedPtr<ServerSession> server = parent->server;
- if (server) {
- server->ClientDisconnected();
+ if (parent->server) {
+ parent->server->ClientDisconnected();
}
parent->client = nullptr;
}
-ResultCode ClientSession::SendSyncRequest(SharedPtr<Thread> thread) {
+ResultCode ClientSession::SendSyncRequest(Thread* thread) {
// Keep ServerSession alive until we're done working with it.
- SharedPtr<ServerSession> server = parent->server;
- if (server == nullptr)
+ if (parent->server == nullptr)
return ERR_SESSION_CLOSED_BY_REMOTE;
// Signal the server session that new data is available
- return server->HandleSyncRequest(std::move(thread));
+ return parent->server->HandleSyncRequest(SharedFrom(thread));
}
} // namespace Kernel