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/server_session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/hle/kernel/server_session.cpp') 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 From 6383653a8df93d3daa1d5b8e1e694905684ccbda Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 29 Oct 2018 23:20:17 -0400 Subject: hle_ipc: Add member function for querying the existence of a domain header Gets rid of the need to call the getter and then check for null. --- src/core/hle/kernel/server_session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/hle/kernel/server_session.cpp') diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index afb3beed2..80897f3a4 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp @@ -111,7 +111,7 @@ ResultCode ServerSession::HandleSyncRequest(SharedPtr thread) { ResultCode result = RESULT_SUCCESS; // If the session has been converted to a domain, handle the domain request - if (IsDomain() && context.GetDomainMessageHeader()) { + if (IsDomain() && context.HasDomainMessageHeader()) { result = HandleDomainSyncRequest(context); // If there is no domain header, the regular session handler is used } else if (hle_handler != nullptr) { -- cgit v1.2.3