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
This commit is contained in:
parent
72df55f8a5
commit
18636013c9
105 changed files with 906 additions and 667 deletions
4
externals/microprofile/microprofile.h
vendored
4
externals/microprofile/microprofile.h
vendored
|
@ -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>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue