diff options
| author | 2022-02-02 16:04:26 -0500 | |
|---|---|---|
| committer | 2022-02-02 16:04:26 -0500 | |
| commit | d68eb751c53df785f842d56983ce4dfbb89aae3f (patch) | |
| tree | 510752a162e2bbb0e0f5a1e60b499aa4dca0493e /src/core/loader | |
| parent | Merge pull request #7834 from german77/repeat (diff) | |
| parent | common_types: Remove NonCopyable struct (diff) | |
| download | yuzu-d68eb751c53df785f842d56983ce4dfbb89aae3f.tar.gz yuzu-d68eb751c53df785f842d56983ce4dfbb89aae3f.tar.xz yuzu-d68eb751c53df785f842d56983ce4dfbb89aae3f.zip | |
Merge pull request #7838 from lioncash/noncopy
common_types: Remove NonCopyable struct
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/loader.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 7b1bac3f7..8b6b3b68f 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <utility> | 11 | #include <utility> |
| 12 | #include <vector> | 12 | #include <vector> |
| 13 | 13 | ||
| 14 | #include "common/common_funcs.h" | ||
| 14 | #include "common/common_types.h" | 15 | #include "common/common_types.h" |
| 15 | #include "core/file_sys/control_metadata.h" | 16 | #include "core/file_sys/control_metadata.h" |
| 16 | #include "core/file_sys/vfs.h" | 17 | #include "core/file_sys/vfs.h" |
| @@ -139,8 +140,11 @@ std::string GetResultStatusString(ResultStatus status); | |||
| 139 | std::ostream& operator<<(std::ostream& os, ResultStatus status); | 140 | std::ostream& operator<<(std::ostream& os, ResultStatus status); |
| 140 | 141 | ||
| 141 | /// Interface for loading an application | 142 | /// Interface for loading an application |
| 142 | class AppLoader : NonCopyable { | 143 | class AppLoader { |
| 143 | public: | 144 | public: |
| 145 | YUZU_NON_COPYABLE(AppLoader); | ||
| 146 | YUZU_NON_MOVEABLE(AppLoader); | ||
| 147 | |||
| 144 | struct LoadParameters { | 148 | struct LoadParameters { |
| 145 | s32 main_thread_priority; | 149 | s32 main_thread_priority; |
| 146 | u64 main_thread_stack_size; | 150 | u64 main_thread_stack_size; |