diff options
| author | 2018-06-20 16:46:14 -0400 | |
|---|---|---|
| committer | 2018-06-20 16:46:14 -0400 | |
| commit | c3e95086b66dfa4214892dcddb9fd6f865037c1e (patch) | |
| tree | 859f41acecbdcfcbdf19df80903a045d6e2b0bcb /src/core/hle/kernel/svc.cpp | |
| parent | Implement GetAvailableLanguageCodes2 (#575) (diff) | |
| parent | Build: Fixed some MSVC warnings in various parts of the code. (diff) | |
| download | yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.gz yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.xz yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.zip | |
Merge pull request #576 from Subv/warnings1
Build: Fixed some MSVC warnings in various parts of the code.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 097416e9e..69ba7b777 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -749,7 +749,7 @@ static ResultCode SetThreadCoreMask(Handle thread_handle, u32 core, u64 mask) { | |||
| 749 | ASSERT(thread->owner_process->ideal_processor != THREADPROCESSORID_DEFAULT); | 749 | ASSERT(thread->owner_process->ideal_processor != THREADPROCESSORID_DEFAULT); |
| 750 | // Set the target CPU to the one specified in the process' exheader. | 750 | // Set the target CPU to the one specified in the process' exheader. |
| 751 | core = thread->owner_process->ideal_processor; | 751 | core = thread->owner_process->ideal_processor; |
| 752 | mask = 1 << core; | 752 | mask = 1ull << core; |
| 753 | } | 753 | } |
| 754 | 754 | ||
| 755 | if (mask == 0) { | 755 | if (mask == 0) { |
| @@ -766,7 +766,7 @@ static ResultCode SetThreadCoreMask(Handle thread_handle, u32 core, u64 mask) { | |||
| 766 | } | 766 | } |
| 767 | 767 | ||
| 768 | // Error out if the input core isn't enabled in the input mask. | 768 | // Error out if the input core isn't enabled in the input mask. |
| 769 | if (core < Core::NUM_CPU_CORES && (mask & (1 << core)) == 0) { | 769 | if (core < Core::NUM_CPU_CORES && (mask & (1ull << core)) == 0) { |
| 770 | return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidCombination); | 770 | return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidCombination); |
| 771 | } | 771 | } |
| 772 | 772 | ||