summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2018-12-06 01:33:19 -0500
committerGravatar Lioncash2018-12-06 01:33:22 -0500
commitd8625f5544dd0caba80d9ba0be51d0ba96414ae2 (patch)
treefbbc4412dc29c0624e10d7b80716fe6675ccf1cc
parenthle/service, hle/sm: Use structured bindings where applicable (diff)
downloadyuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.tar.gz
yuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.tar.xz
yuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.zip
hle/service, hle/sm: Compress usages of MakeResult()
These auto-deduce the result based off its arguments, so there's no need to do that work for the compiler, plus, the function return value itself already indicates what we're returning.
-rw-r--r--src/core/hle/service/service.cpp2
-rw-r--r--src/core/hle/service/sm/sm.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 7de2c5a40..0ca234d50 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -122,7 +122,7 @@ Kernel::SharedPtr<Kernel::ClientPort> ServiceFrameworkBase::CreatePort() {
122 auto& kernel = Core::System::GetInstance().Kernel(); 122 auto& kernel = Core::System::GetInstance().Kernel();
123 auto [server_port, client_port] = 123 auto [server_port, client_port] =
124 Kernel::ServerPort::CreatePortPair(kernel, max_sessions, service_name); 124 Kernel::ServerPort::CreatePortPair(kernel, max_sessions, service_name);
125 port = MakeResult<Kernel::SharedPtr<Kernel::ServerPort>>(std::move(server_port)).Unwrap(); 125 port = MakeResult(std::move(server_port)).Unwrap();
126 port->SetHleHandler(shared_from_this()); 126 port->SetHleHandler(shared_from_this());
127 return client_port; 127 return client_port;
128} 128}
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index d0e35b4d6..d73530086 100644
--- a/src/core/hle/service/sm/sm.cpp
+++ b/src/core/hle/service/sm/sm.cpp
@@ -58,7 +58,7 @@ ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> ServiceManager::RegisterService
58 Kernel::ServerPort::CreatePortPair(kernel, max_sessions, name); 58 Kernel::ServerPort::CreatePortPair(kernel, max_sessions, name);
59 59
60 registered_services.emplace(std::move(name), std::move(client_port)); 60 registered_services.emplace(std::move(name), std::move(client_port));
61 return MakeResult<Kernel::SharedPtr<Kernel::ServerPort>>(std::move(server_port)); 61 return MakeResult(std::move(server_port));
62} 62}
63 63
64ResultCode ServiceManager::UnregisterService(const std::string& name) { 64ResultCode ServiceManager::UnregisterService(const std::string& name) {
@@ -81,7 +81,7 @@ ResultVal<Kernel::SharedPtr<Kernel::ClientPort>> ServiceManager::GetServicePort(
81 return ERR_SERVICE_NOT_REGISTERED; 81 return ERR_SERVICE_NOT_REGISTERED;
82 } 82 }
83 83
84 return MakeResult<Kernel::SharedPtr<Kernel::ClientPort>>(it->second); 84 return MakeResult(it->second);
85} 85}
86 86
87ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ServiceManager::ConnectToService( 87ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ServiceManager::ConnectToService(