diff options
| author | James Rowe <jroweboy@gmail.com> | 2017-08-22 08:09:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 08:09:09 -0600 |
| commit | a8675f42875d7ad41ef64b89ec478834042355dd (patch) | |
| tree | 8e2c67c072ad8d874d1b5685a8d084719acb90af /src/core/arm/dynarmic | |
| parent | 03c782e378cdcd206267656d69dbc98cf8c6274e (diff) | |
| parent | 8a9a4e2c42b6c2326140f7369374bf78a4645a8f (diff) | |
Merge pull request #2888 from Subv/warnings
Fixed some warnings in the core project.
Diffstat (limited to 'src/core/arm/dynarmic')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 7d2790b08..0a0b91590 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -136,7 +136,7 @@ MICROPROFILE_DEFINE(ARM_Jit, "ARM JIT", "ARM JIT", MP_RGB(255, 64, 64)); void ARM_Dynarmic::ExecuteInstructions(int num_instructions) { MICROPROFILE_SCOPE(ARM_Jit); - unsigned ticks_executed = jit->Run(static_cast<unsigned>(num_instructions)); + std::size_t ticks_executed = jit->Run(static_cast<unsigned>(num_instructions)); AddTicks(ticks_executed); } |