diff options
| author | 2014-09-06 13:30:27 -0400 | |
|---|---|---|
| committer | 2014-09-06 13:30:27 -0400 | |
| commit | d30747efea01b61dba44abe50f2b7a9d8f9da3a5 (patch) | |
| tree | 6989ba1e8ad0087d6c9874de151bdc5f1f42f96d /src/core | |
| parent | Merge pull request #88 from archshift/remove-atomic (diff) | |
| download | yuzu-d30747efea01b61dba44abe50f2b7a9d8f9da3a5.tar.gz yuzu-d30747efea01b61dba44abe50f2b7a9d8f9da3a5.tar.xz yuzu-d30747efea01b61dba44abe50f2b7a9d8f9da3a5.zip | |
core: Pass string by reference in FetchFromPortName and DeleteService
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/service.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/service.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index d3af2768a..00ac1c9c6 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -41,7 +41,7 @@ void Manager::AddService(Interface* service) { | |||
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | /// Removes a service from the manager, also frees memory | 43 | /// Removes a service from the manager, also frees memory |
| 44 | void Manager::DeleteService(std::string port_name) { | 44 | void Manager::DeleteService(const std::string& port_name) { |
| 45 | Interface* service = FetchFromPortName(port_name); | 45 | Interface* service = FetchFromPortName(port_name); |
| 46 | m_services.erase(std::remove(m_services.begin(), m_services.end(), service), m_services.end()); | 46 | m_services.erase(std::remove(m_services.begin(), m_services.end(), service), m_services.end()); |
| 47 | m_port_map.erase(port_name); | 47 | m_port_map.erase(port_name); |
| @@ -54,7 +54,7 @@ Interface* Manager::FetchFromHandle(Handle handle) { | |||
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | /// Get a Service Interface from its port | 56 | /// Get a Service Interface from its port |
| 57 | Interface* Manager::FetchFromPortName(std::string port_name) { | 57 | Interface* Manager::FetchFromPortName(const std::string& port_name) { |
| 58 | auto itr = m_port_map.find(port_name); | 58 | auto itr = m_port_map.find(port_name); |
| 59 | if (itr == m_port_map.end()) { | 59 | if (itr == m_port_map.end()) { |
| 60 | return nullptr; | 60 | return nullptr; |
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index cb1ecde31..c0e803bda 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h | |||
| @@ -149,13 +149,13 @@ public: | |||
| 149 | void AddService(Interface* service); | 149 | void AddService(Interface* service); |
| 150 | 150 | ||
| 151 | /// Removes a service from the manager (does not delete it though) | 151 | /// Removes a service from the manager (does not delete it though) |
| 152 | void DeleteService(std::string port_name); | 152 | void DeleteService(const std::string& port_name); |
| 153 | 153 | ||
| 154 | /// Get a Service Interface from its UID | 154 | /// Get a Service Interface from its UID |
| 155 | Interface* FetchFromHandle(u32 uid); | 155 | Interface* FetchFromHandle(u32 uid); |
| 156 | 156 | ||
| 157 | /// Get a Service Interface from its port | 157 | /// Get a Service Interface from its port |
| 158 | Interface* FetchFromPortName(std::string port_name); | 158 | Interface* FetchFromPortName(const std::string& port_name); |
| 159 | 159 | ||
| 160 | private: | 160 | private: |
| 161 | 161 | ||