octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change over to std::shared_ptr

This commit is contained in:
James Rowe 2019-08-14 21:30:49 -06:00
parent 61ebeca765
commit 331a9fc12b
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/hle/service/apt/apt.cpp
View File

@ -12,7 +12,6 @@
#include "core/hle/kernel/mutex.h" #include "core/hle/kernel/mutex.h"
#include "core/hle/kernel/shared_memory.h" #include "core/hle/kernel/shared_memory.h"
#include "core/hle/romfs.h" #include "core/hle/romfs.h"
#include "core/hle/service/am/am.h"
#include "core/hle/service/apt/applet_manager.h" #include "core/hle/service/apt/applet_manager.h"
#include "core/hle/service/apt/apt.h" #include "core/hle/service/apt/apt.h"
#include "core/hle/service/apt/apt_a.h" #include "core/hle/service/apt/apt_a.h"

4
src/core/hle/service/apt/ns.cpp
View File

@ -10,7 +10,7 @@
namespace Service::NS { namespace Service::NS {
Kernel::SharedPtr<Kernel::Process> LaunchTitle(FS::MediaType media_type, u64 title_id) { std::shared_ptr<Kernel::Process> LaunchTitle(FS::MediaType media_type, u64 title_id) {
std::string path = AM::GetTitleContentPath(media_type, title_id); std::string path = AM::GetTitleContentPath(media_type, title_id);
auto loader = Loader::GetLoader(path); auto loader = Loader::GetLoader(path);
@ -19,7 +19,7 @@ Kernel::SharedPtr<Kernel::Process> LaunchTitle(FS::MediaType media_type, u64 tit
return nullptr; return nullptr;
} }
Kernel::SharedPtr<Kernel::Process> process; std::shared_ptr<Kernel::Process> process;
Loader::ResultStatus result = loader->Load(process); Loader::ResultStatus result = loader->Load(process);
if (result != Loader::ResultStatus::Success) { if (result != Loader::ResultStatus::Success) {

2
src/core/hle/service/apt/ns.h
View File

@ -15,6 +15,6 @@ class System;
namespace Service::NS { namespace Service::NS {
/// Loads and launches the title identified by title_id in the specified media type. /// Loads and launches the title identified by title_id in the specified media type.
Kernel::SharedPtr<Kernel::Process> LaunchTitle(FS::MediaType media_type, u64 title_id); std::shared_ptr<Kernel::Process> LaunchTitle(FS::MediaType media_type, u64 title_id);
} // namespace Service::NS } // namespace Service::NS