diff options
| author | 2018-11-24 00:04:07 -0500 | |
|---|---|---|
| committer | 2018-11-24 00:08:13 -0500 | |
| commit | b0df09335cce3f4a2c49bf27d23de85a3c0113dc (patch) | |
| tree | 9037a23f6d64e59d1fece95ffedf58349eba5ef1 | |
| parent | Merge pull request #1641 from DarkLordZach/sm-register-unregister (diff) | |
| download | yuzu-b0df09335cce3f4a2c49bf27d23de85a3c0113dc.tar.gz yuzu-b0df09335cce3f4a2c49bf27d23de85a3c0113dc.tar.xz yuzu-b0df09335cce3f4a2c49bf27d23de85a3c0113dc.zip | |
service/sm: Take std::string by const reference in UnregisterService
Avoids the need to create a copy of the std::string instance
(potentially allocating).
The only reason RegisterService takes its argument by value is because
it's std::moved internally.
| -rw-r--r-- | src/core/hle/service/sm/sm.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/sm/sm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index c1b2f33b9..9ca8483a5 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp | |||
| @@ -63,7 +63,7 @@ ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> ServiceManager::RegisterService | |||
| 63 | return MakeResult<Kernel::SharedPtr<Kernel::ServerPort>>(std::move(server_port)); | 63 | return MakeResult<Kernel::SharedPtr<Kernel::ServerPort>>(std::move(server_port)); |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | ResultCode ServiceManager::UnregisterService(std::string name) { | 66 | ResultCode ServiceManager::UnregisterService(const std::string& name) { |
| 67 | CASCADE_CODE(ValidateServiceName(name)); | 67 | CASCADE_CODE(ValidateServiceName(name)); |
| 68 | 68 | ||
| 69 | const auto iter = registered_services.find(name); | 69 | const auto iter = registered_services.find(name); |
diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index c4714b3e3..bef25433e 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h | |||
| @@ -50,7 +50,7 @@ public: | |||
| 50 | 50 | ||
| 51 | ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> RegisterService(std::string name, | 51 | ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> RegisterService(std::string name, |
| 52 | unsigned int max_sessions); | 52 | unsigned int max_sessions); |
| 53 | ResultCode UnregisterService(std::string name); | 53 | ResultCode UnregisterService(const std::string& name); |
| 54 | ResultVal<Kernel::SharedPtr<Kernel::ClientPort>> GetServicePort(const std::string& name); | 54 | ResultVal<Kernel::SharedPtr<Kernel::ClientPort>> GetServicePort(const std::string& name); |
| 55 | ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ConnectToService(const std::string& name); | 55 | ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ConnectToService(const std::string& name); |
| 56 | 56 | ||