diff options
| author |  Lioncash | 2020-10-15 14:49:45 -0400 |
|---|---|---|
| committer | Lioncash | 2020-10-17 19:50:39 -0400 |
| commit | be1954e04cb5a0c3a526f78ed5490a5e65310280 (patch) | |
| tree | 267db7ae4be88dbbc288fa605e35d4a2a13839f6 /externals | |
| parent | Merge pull request #4787 from lioncash/conversion (diff) | |
| download | yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.tar.gz yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.tar.xz yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.zip | |
core: Fix clang build
Recent changes to the build system that made more warnings be flagged as
errors caused building via clang to break.
Fixes #4795
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/microprofile/microprofile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index 85d5bd5de..d22f92868 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h | |||
| @@ -857,7 +857,7 @@ inline int64_t MicroProfileLogTickDifference(MicroProfileLogEntry Start, MicroPr | |||
| 857 | { | 857 | { |
| 858 | uint64_t nStart = Start; | 858 | uint64_t nStart = Start; |
| 859 | uint64_t nEnd = End; | 859 | uint64_t nEnd = End; |
| 860 | int64_t nDifference = ((nEnd<<16) - (nStart<<16)); | 860 | auto nDifference = static_cast<int64_t>((nEnd << 16) - (nStart << 16)); |
| 861 | return nDifference >> 16; | 861 | return nDifference >> 16; |
| 862 | } | 862 | } |
| 863 | 863 | ||
| @@ -868,7 +868,7 @@ inline int64_t MicroProfileLogGetTick(MicroProfileLogEntry e) | |||
| 868 | 868 | ||
| 869 | inline int64_t MicroProfileLogSetTick(MicroProfileLogEntry e, int64_t nTick) | 869 | inline int64_t MicroProfileLogSetTick(MicroProfileLogEntry e, int64_t nTick) |
| 870 | { | 870 | { |
| 871 | return (MP_LOG_TICK_MASK & nTick) | (e & ~MP_LOG_TICK_MASK); | 871 | return static_cast<int64_t>((MP_LOG_TICK_MASK & static_cast<uint64_t>(nTick)) | (e & static_cast<uint64_t>(~MP_LOG_TICK_MASK))); |
| 872 | } | 872 | } |
| 873 | 873 | ||
| 874 | template<typename T> | 874 | template<typename T> |