aboutsummaryrefslogtreecommitdiffhomepage
path: root/externals/microprofile
diff options
context:
space:
mode:
authorLioncash <[email protected]>2020-10-15 14:49:45 -0400
committerLioncash <[email protected]>2020-10-17 19:50:39 -0400
commitbe1954e04cb5a0c3a526f78ed5490a5e65310280 (patch)
tree267db7ae4be88dbbc288fa605e35d4a2a13839f6 /externals/microprofile
parentca416a0fb87ced0e471729fe344b9f34a090e7b5 (diff)
downloadyuzu-android-be1954e04cb5a0c3a526f78ed5490a5e65310280.tar.gz
yuzu-android-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/microprofile')
-rw-r--r--externals/microprofile/microprofile.h4
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
{
uint64_t nStart = Start;
uint64_t nEnd = End;
- int64_t nDifference = ((nEnd<<16) - (nStart<<16));
+ auto nDifference = static_cast<int64_t>((nEnd << 16) - (nStart << 16));
return nDifference >> 16;
}
@@ -868,7 +868,7 @@ inline int64_t MicroProfileLogGetTick(MicroProfileLogEntry e)
inline int64_t MicroProfileLogSetTick(MicroProfileLogEntry e, int64_t nTick)
{
- return (MP_LOG_TICK_MASK & nTick) | (e & ~MP_LOG_TICK_MASK);
+ return static_cast<int64_t>((MP_LOG_TICK_MASK & static_cast<uint64_t>(nTick)) | (e & static_cast<uint64_t>(~MP_LOG_TICK_MASK)));
}
template<typename T>