From 7b07e521cab33c54e68def947dff36f8536921a6 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 2 Feb 2020 00:38:22 -0500 Subject: hle: services: Use std::shared_ptr instead of copy by value. --- src/core/hle/service/am/applets/applets.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/core/hle/service/am/applets/applets.cpp') diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cpp index 3e97ba218..c3261f3e6 100644 --- a/src/core/hle/service/am/applets/applets.cpp +++ b/src/core/hle/service/am/applets/applets.cpp @@ -50,7 +50,7 @@ AppletDataBroker::RawChannelData AppletDataBroker::PeekDataToAppletForDebug() co return {std::move(out_normal), std::move(out_interactive)}; } -std::unique_ptr AppletDataBroker::PopNormalDataToGame() { +std::shared_ptr AppletDataBroker::PopNormalDataToGame() { if (out_channel.empty()) return nullptr; @@ -60,7 +60,7 @@ std::unique_ptr AppletDataBroker::PopNormalDataToGame() { return out; } -std::unique_ptr AppletDataBroker::PopNormalDataToApplet() { +std::shared_ptr AppletDataBroker::PopNormalDataToApplet() { if (in_channel.empty()) return nullptr; @@ -69,7 +69,7 @@ std::unique_ptr AppletDataBroker::PopNormalDataToApplet() { return out; } -std::unique_ptr AppletDataBroker::PopInteractiveDataToGame() { +std::shared_ptr AppletDataBroker::PopInteractiveDataToGame() { if (out_interactive_channel.empty()) return nullptr; @@ -79,7 +79,7 @@ std::unique_ptr AppletDataBroker::PopInteractiveDataToGame() { return out; } -std::unique_ptr AppletDataBroker::PopInteractiveDataToApplet() { +std::shared_ptr AppletDataBroker::PopInteractiveDataToApplet() { if (in_interactive_channel.empty()) return nullptr; @@ -88,21 +88,21 @@ std::unique_ptr AppletDataBroker::PopInteractiveDataToApplet() { return out; } -void AppletDataBroker::PushNormalDataFromGame(IStorage storage) { - in_channel.push_back(std::make_unique(storage)); +void AppletDataBroker::PushNormalDataFromGame(std::shared_ptr&& storage) { + in_channel.emplace_back(std::move(storage)); } -void AppletDataBroker::PushNormalDataFromApplet(IStorage storage) { - out_channel.push_back(std::make_unique(storage)); +void AppletDataBroker::PushNormalDataFromApplet(std::shared_ptr&& storage) { + out_channel.emplace_back(std::move(storage)); pop_out_data_event.writable->Signal(); } -void AppletDataBroker::PushInteractiveDataFromGame(IStorage storage) { - in_interactive_channel.push_back(std::make_unique(storage)); +void AppletDataBroker::PushInteractiveDataFromGame(std::shared_ptr&& storage) { + in_interactive_channel.emplace_back(std::move(storage)); } -void AppletDataBroker::PushInteractiveDataFromApplet(IStorage storage) { - out_interactive_channel.push_back(std::make_unique(storage)); +void AppletDataBroker::PushInteractiveDataFromApplet(std::shared_ptr&& storage) { + out_interactive_channel.emplace_back(std::move(storage)); pop_interactive_out_data_event.writable->Signal(); } -- cgit v1.2.3