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/general_backend.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/core/hle/service/am/applets/general_backend.cpp') diff --git a/src/core/hle/service/am/applets/general_backend.cpp b/src/core/hle/service/am/applets/general_backend.cpp index fe8400a15..104501ac5 100644 --- a/src/core/hle/service/am/applets/general_backend.cpp +++ b/src/core/hle/service/am/applets/general_backend.cpp @@ -20,7 +20,7 @@ namespace Service::AM::Applets { constexpr ResultCode ERROR_INVALID_PIN{ErrorModule::PCTL, 221}; static void LogCurrentStorage(AppletDataBroker& broker, std::string_view prefix) { - std::unique_ptr storage = broker.PopNormalDataToApplet(); + std::shared_ptr storage = broker.PopNormalDataToApplet(); for (; storage != nullptr; storage = broker.PopNormalDataToApplet()) { const auto data = storage->GetData(); LOG_INFO(Service_AM, @@ -148,7 +148,7 @@ void Auth::AuthFinished(bool successful) { std::vector out(sizeof(Return)); std::memcpy(out.data(), &return_, sizeof(Return)); - broker.PushNormalDataFromApplet(IStorage{std::move(out)}); + broker.PushNormalDataFromApplet(std::make_shared(std::move(out))); broker.SignalStateChanged(); } @@ -198,7 +198,7 @@ void PhotoViewer::Execute() { } void PhotoViewer::ViewFinished() { - broker.PushNormalDataFromApplet(IStorage{std::vector{}}); + broker.PushNormalDataFromApplet(std::make_shared(std::vector{})); broker.SignalStateChanged(); } @@ -234,8 +234,8 @@ void StubApplet::ExecuteInteractive() { LOG_WARNING(Service_AM, "called (STUBBED)"); LogCurrentStorage(broker, "ExecuteInteractive"); - broker.PushNormalDataFromApplet(IStorage{std::vector(0x1000)}); - broker.PushInteractiveDataFromApplet(IStorage{std::vector(0x1000)}); + broker.PushNormalDataFromApplet(std::make_shared(std::vector(0x1000))); + broker.PushInteractiveDataFromApplet(std::make_shared(std::vector(0x1000))); broker.SignalStateChanged(); } @@ -243,8 +243,8 @@ void StubApplet::Execute() { LOG_WARNING(Service_AM, "called (STUBBED)"); LogCurrentStorage(broker, "Execute"); - broker.PushNormalDataFromApplet(IStorage{std::vector(0x1000)}); - broker.PushInteractiveDataFromApplet(IStorage{std::vector(0x1000)}); + broker.PushNormalDataFromApplet(std::make_shared(std::vector(0x1000))); + broker.PushInteractiveDataFromApplet(std::make_shared(std::vector(0x1000))); broker.SignalStateChanged(); } -- cgit v1.2.3