From d2163e15465e79936fb961624213f3617251234f Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 22 Mar 2022 13:27:05 -0700 Subject: [PATCH] fs/sprof/build: fix minor issues --- libstratosphere/source/fs/fs_code.cpp | 4 ++-- libstratosphere/source/fs/fs_sd_card.cpp | 2 +- .../source/sprofile/srv/sprofile_srv_service_getter.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libstratosphere/source/fs/fs_code.cpp b/libstratosphere/source/fs/fs_code.cpp index c7002393..b39df8f1 100644 --- a/libstratosphere/source/fs/fs_code.cpp +++ b/libstratosphere/source/fs/fs_code.cpp @@ -134,7 +134,7 @@ namespace ams::fs { } /* Create a file storage for the program's package. */ - auto package_storage = std::make_shared(std::move(package_file)); + auto package_storage = fs::AllocateShared(std::move(package_file)); R_UNLESS(package_storage != nullptr, fs::ResultAllocationMemoryFailedInCodeA()); /* Create a partition filesystem. */ @@ -177,7 +177,7 @@ namespace ams::fs { R_TRY(fsp->OpenSdCardFileSystem(std::addressof(fs))); /* Allocate a new filesystem wrapper. */ - auto fsa = std::make_shared(std::move(fs)); + auto fsa = fs::AllocateShared(std::move(fs)); R_UNLESS(fsa != nullptr, fs::ResultAllocationMemoryFailedInCodeA()); *out = std::move(fsa); diff --git a/libstratosphere/source/fs/fs_sd_card.cpp b/libstratosphere/source/fs/fs_sd_card.cpp index 7432081c..17051630 100644 --- a/libstratosphere/source/fs/fs_sd_card.cpp +++ b/libstratosphere/source/fs/fs_sd_card.cpp @@ -79,7 +79,7 @@ namespace ams::fs { R_TRY(fsp->OpenSdCardFileSystem(std::addressof(fs))); /* Allocate a new filesystem wrapper. */ - auto fsa = std::make_shared(std::move(fs)); + auto fsa = fs::AllocateShared(std::move(fs)); R_UNLESS(fsa != nullptr, fs::ResultAllocationMemoryFailedInSdCardA()); /* Ensure that the error report directory exists. */ diff --git a/libstratosphere/source/sprofile/srv/sprofile_srv_service_getter.hpp b/libstratosphere/source/sprofile/srv/sprofile_srv_service_getter.hpp index accf6524..d741abc7 100644 --- a/libstratosphere/source/sprofile/srv/sprofile_srv_service_getter.hpp +++ b/libstratosphere/source/sprofile/srv/sprofile_srv_service_getter.hpp @@ -24,7 +24,7 @@ namespace ams::sprofile::srv { sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForBgAgent> m_service_for_bg_agent; sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForSystemProcess> m_service_for_system_process; public: - constexpr ServiceGetter(sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForBgAgent> &&bg, sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForSystemProcess> &&sp) : m_service_for_bg_agent(bg), m_service_for_system_process(sp) { /* ... */ } + constexpr ServiceGetter(sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForBgAgent> bg, sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForSystemProcess> sp) : m_service_for_bg_agent(bg), m_service_for_system_process(sp) { /* ... */ } public: Result GetServiceForSystemProcess(sf::Out> out); Result GetServiceForBgAgent(sf::Out> out);