diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-11-13 02:16:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-13 02:16:22 -0300 |
| commit | cf770a68a528cdb7f3a5483f6d17eeb924e37b7e (patch) | |
| tree | 6406933e26e9fbe255a04b4c0810d21b05815494 /externals/microprofile/microprofile.h | |
| parent | d1f0d182a73f79f7b82751f4ac1502e7eb9bba76 (diff) | |
| parent | fb9418798d9421128c17a52c2b0160d71f015db0 (diff) | |
Merge pull request #3084 from ReinUsesLisp/cast-warnings
video_core: Treat implicit conversions as errors
Diffstat (limited to 'externals/microprofile/microprofile.h')
| -rw-r--r-- | externals/microprofile/microprofile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index 384863ccc..cdb312b87 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h @@ -814,7 +814,7 @@ struct MicroProfile inline int MicroProfileLogType(MicroProfileLogEntry Index) { - return ((MP_LOG_BEGIN_MASK & Index)>>62) & 0x3; + return (int)(((MP_LOG_BEGIN_MASK & Index)>>62) & 0x3ULL); } inline uint64_t MicroProfileLogTimerIndex(MicroProfileLogEntry Index) @@ -861,12 +861,12 @@ T MicroProfileMax(T a, T b) inline int64_t MicroProfileMsToTick(float fMs, int64_t nTicksPerSecond) { - return (int64_t)(fMs*0.001f*nTicksPerSecond); + return (int64_t)(fMs*0.001f*(float)nTicksPerSecond); } inline float MicroProfileTickToMsMultiplier(int64_t nTicksPerSecond) { - return 1000.f / nTicksPerSecond; + return 1000.f / (float)nTicksPerSecond; } inline uint16_t MicroProfileGetGroupIndex(MicroProfileToken t) |