diff options
| author | 2020-10-20 19:19:12 -0400 | |
|---|---|---|
| committer | 2020-10-20 19:19:12 -0400 | |
| commit | 88d5140cf2f80d51dc297af3a128a4212215149f (patch) | |
| tree | cd524e8ab111fba79f75a48cc672cb875251a32f /src/core/hle/kernel/thread.h | |
| parent | Merge pull request #4390 from ogniK5377/get-applet-inf-stub (diff) | |
| parent | core: Fix clang build (diff) | |
| download | yuzu-88d5140cf2f80d51dc297af3a128a4212215149f.tar.gz yuzu-88d5140cf2f80d51dc297af3a128a4212215149f.tar.xz yuzu-88d5140cf2f80d51dc297af3a128a4212215149f.zip | |
Merge pull request #4796 from lioncash/clang
core: Fix clang build
Diffstat (limited to 'src/core/hle/kernel/thread.h')
| -rw-r--r-- | src/core/hle/kernel/thread.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 8daf79fac..21b22ca45 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h | |||
| @@ -470,7 +470,7 @@ public: | |||
| 470 | 470 | ||
| 471 | bool InvokeHLECallback(std::shared_ptr<Thread> thread); | 471 | bool InvokeHLECallback(std::shared_ptr<Thread> thread); |
| 472 | 472 | ||
| 473 | u32 GetIdealCore() const { | 473 | s32 GetIdealCore() const { |
| 474 | return ideal_core; | 474 | return ideal_core; |
| 475 | } | 475 | } |
| 476 | 476 | ||
| @@ -654,8 +654,8 @@ private: | |||
| 654 | 654 | ||
| 655 | Scheduler* scheduler = nullptr; | 655 | Scheduler* scheduler = nullptr; |
| 656 | 656 | ||
| 657 | u32 ideal_core{0xFFFFFFFF}; | 657 | s32 ideal_core = -1; |
| 658 | u64 affinity_mask{0x1}; | 658 | u64 affinity_mask = 1; |
| 659 | 659 | ||
| 660 | s32 ideal_core_override = -1; | 660 | s32 ideal_core_override = -1; |
| 661 | u64 affinity_mask_override = 0x1; | 661 | u64 affinity_mask_override = 0x1; |