From 155f15819747ed31582dbc3929957b952c9d484f Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 19 Sep 2021 11:00:57 -0700 Subject: [PATCH] ncm: fix destructor availability --- .../source/ncm/ncm_host_content_storage_impl.hpp | 1 - .../source/ncm/ncm_registered_host_content.cpp | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libraries/libstratosphere/source/ncm/ncm_host_content_storage_impl.hpp b/libraries/libstratosphere/source/ncm/ncm_host_content_storage_impl.hpp index 66133547a..c8159512f 100644 --- a/libraries/libstratosphere/source/ncm/ncm_host_content_storage_impl.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_host_content_storage_impl.hpp @@ -40,7 +40,6 @@ namespace ams::ncm { } public: HostContentStorageImpl(RegisteredHostContent *registered_content) : registered_content(registered_content), disabled(false) { /* ... */ } - ~HostContentStorageImpl(); public: /* Actual commands. */ virtual Result GeneratePlaceHolderId(sf::Out out); diff --git a/libraries/libstratosphere/source/ncm/ncm_registered_host_content.cpp b/libraries/libstratosphere/source/ncm/ncm_registered_host_content.cpp index 007365462..7b0050281 100644 --- a/libraries/libstratosphere/source/ncm/ncm_registered_host_content.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_registered_host_content.cpp @@ -16,7 +16,7 @@ #include namespace ams::ncm { - + class RegisteredHostContent::RegisteredPath : public util::IntrusiveListBaseNode { NON_COPYABLE(RegisteredPath); NON_MOVEABLE(RegisteredPath); @@ -24,8 +24,8 @@ namespace ams::ncm { ContentId content_id; Path path; public: - RegisteredPath(const ncm::ContentId &content_id, const Path &p) : content_id(content_id), path(p) { - /* ... */ + RegisteredPath(const ncm::ContentId &content_id, const Path &p) : content_id(content_id), path(p) { + /* ... */ } ncm::ContentId GetContentId() const { @@ -41,6 +41,10 @@ namespace ams::ncm { } }; + RegisteredHostContent::~RegisteredHostContent() { + /* ... */ + } + Result RegisteredHostContent::RegisterPath(const ncm::ContentId &content_id, const ncm::Path &path) { std::scoped_lock lk(this->mutex);