diff options
| author | 2020-11-24 04:26:59 -0300 | |
|---|---|---|
| committer | 2020-11-24 04:26:59 -0300 | |
| commit | 410ed829224fb2babfa98f38a4f11f5c9a9ed43e (patch) | |
| tree | f72de817aa84142c7bbb5420be86b859e97d039d /src/core/core.cpp | |
| parent | Merge pull request #4972 from lioncash/unused4 (diff) | |
| parent | core: Remove unused private Init function for the System class (diff) | |
| download | yuzu-410ed829224fb2babfa98f38a4f11f5c9a9ed43e.tar.gz yuzu-410ed829224fb2babfa98f38a4f11f5c9a9ed43e.tar.xz yuzu-410ed829224fb2babfa98f38a4f11f5c9a9ed43e.zip | |
Merge pull request #4942 from lioncash/system
core: Make use of [[nodiscard]] with the System class
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 9253e05b7..5accdc783 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -444,6 +444,10 @@ void System::InvalidateCpuInstructionCaches() { | |||
| 444 | impl->kernel.InvalidateAllInstructionCaches(); | 444 | impl->kernel.InvalidateAllInstructionCaches(); |
| 445 | } | 445 | } |
| 446 | 446 | ||
| 447 | void System::Shutdown() { | ||
| 448 | impl->Shutdown(); | ||
| 449 | } | ||
| 450 | |||
| 447 | System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::string& filepath) { | 451 | System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::string& filepath) { |
| 448 | return impl->Load(*this, emu_window, filepath); | 452 | return impl->Load(*this, emu_window, filepath); |
| 449 | } | 453 | } |
| @@ -632,7 +636,11 @@ const std::string& System::GetStatusDetails() const { | |||
| 632 | return impl->status_details; | 636 | return impl->status_details; |
| 633 | } | 637 | } |
| 634 | 638 | ||
| 635 | Loader::AppLoader& System::GetAppLoader() const { | 639 | Loader::AppLoader& System::GetAppLoader() { |
| 640 | return *impl->app_loader; | ||
| 641 | } | ||
| 642 | |||
| 643 | const Loader::AppLoader& System::GetAppLoader() const { | ||
| 636 | return *impl->app_loader; | 644 | return *impl->app_loader; |
| 637 | } | 645 | } |
| 638 | 646 | ||
| @@ -748,14 +756,6 @@ const System::CurrentBuildProcessID& System::GetCurrentProcessBuildID() const { | |||
| 748 | return impl->build_id; | 756 | return impl->build_id; |
| 749 | } | 757 | } |
| 750 | 758 | ||
| 751 | System::ResultStatus System::Init(Frontend::EmuWindow& emu_window) { | ||
| 752 | return impl->Init(*this, emu_window); | ||
| 753 | } | ||
| 754 | |||
| 755 | void System::Shutdown() { | ||
| 756 | impl->Shutdown(); | ||
| 757 | } | ||
| 758 | |||
| 759 | Service::SM::ServiceManager& System::ServiceManager() { | 759 | Service::SM::ServiceManager& System::ServiceManager() { |
| 760 | return *impl->service_manager; | 760 | return *impl->service_manager; |
| 761 | } | 761 | } |