From 0cc347462d3a6992a6d66ccd69629a71cd500cb3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 29 Oct 2018 23:18:21 -0400 Subject: hle_ipc: Make GetDomainMessageHeader return a regular pointer Nothing requires the shared owner ship here, so we can just return a plain pointer. --- src/core/hle/kernel/hle_ipc.h | 4 ++-- src/core/hle/kernel/server_session.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index f01491daa..2e49826a8 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -161,8 +161,8 @@ public: return buffer_c_desciptors; } - const std::shared_ptr& GetDomainMessageHeader() const { - return domain_message_header; + const IPC::DomainMessageHeader* GetDomainMessageHeader() const { + return domain_message_header.get(); } /// Helper function to read a buffer using the appropriate buffer descriptor diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index 5fc320403..afb3beed2 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp @@ -63,7 +63,7 @@ void ServerSession::Acquire(Thread* thread) { } ResultCode ServerSession::HandleDomainSyncRequest(Kernel::HLERequestContext& context) { - auto& domain_message_header = context.GetDomainMessageHeader(); + auto* const domain_message_header = context.GetDomainMessageHeader(); if (domain_message_header) { // Set domain handlers in HLE context, used for domain objects (IPC interfaces) as inputs context.SetDomainRequestHandlers(domain_request_handlers); -- cgit v1.2.3