From b77fde7c5c1f63aad9d4f01ea625805661870f3e Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Sun, 26 May 2019 11:40:41 -0400
Subject: loader: Move NSO module tracking to AppLoader

Also cleanup of general stuff
---
 src/core/hle/service/am/applets/applets.cpp       | 5 +++--
 src/core/hle/service/am/applets/general_backend.h | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/core/hle/service/am')

diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cpp
index 2a945bc7b..d8ad0079a 100644
--- a/src/core/hle/service/am/applets/applets.cpp
+++ b/src/core/hle/service/am/applets/applets.cpp
@@ -37,17 +37,18 @@ AppletDataBroker::~AppletDataBroker() = default;
 
 AppletDataBroker::RawChannelData AppletDataBroker::PeekDataToAppletForDebug() const {
     std::vector<std::vector<u8>> out_normal;
-    std::vector<std::vector<u8>> out_interactive;
 
     for (const auto& storage : in_channel) {
         out_normal.push_back(storage->GetData());
     }
 
+    std::vector<std::vector<u8>> out_interactive;
+
     for (const auto& storage : in_interactive_channel) {
         out_interactive.push_back(storage->GetData());
     }
 
-    return {out_normal, out_interactive};
+    return {std::move(out_normal), std::move(out_interactive)};
 }
 
 std::unique_ptr<IStorage> AppletDataBroker::PopNormalDataToGame() {
diff --git a/src/core/hle/service/am/applets/general_backend.h b/src/core/hle/service/am/applets/general_backend.h
index bc919a8dd..fb68a2543 100644
--- a/src/core/hle/service/am/applets/general_backend.h
+++ b/src/core/hle/service/am/applets/general_backend.h
@@ -34,7 +34,7 @@ private:
 
 class StubApplet final : public Applet {
 public:
-    StubApplet(AppletId id);
+    explicit StubApplet(AppletId id);
     ~StubApplet() override;
 
     void Initialize() override;
-- 
cgit v1.2.3